diff --git a/Android.mk b/Android.mk
index 0663e858e1b..8b6532cabdf 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,10 +6,13 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := \
+        $(call all-java-files-under, src) \
+        src/com/android/settings/EventLogTags.logtags
 
 LOCAL_PACKAGE_NAME := Settings
 LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := true
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b489a896bc1..b730ba72efb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -15,6 +15,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_PRIVILEGED" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.HARDWARE_TEST" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
@@ -64,11 +65,13 @@
     <uses-permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY" />
     <uses-permission android:name="android.permission.SET_TIME" />
     <uses-permission android:name="android.permission.ACCESS_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.REBOOT" />
+    <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
 
     <application android:label="@string/settings_label"
             android:icon="@mipmap/ic_launcher_settings"
             android:taskAffinity=""
-            android:theme="@android:style/Theme.Holo"
+            android:theme="@style/Theme.Settings"
             android:hardwareAccelerated="true"
             android:requiredForAllUsers="true"
             android:supportsRtl="true">
@@ -169,7 +172,7 @@
 
         <activity android:name=".wifi.WifiSetupActivity"
                 android:uiOptions="splitActionBarWhenNarrow"
-                android:theme="@style/setup_wizard_theme"
+                android:theme="@style/SetupWizardWifiTheme"
                 android:label="@string/wifi_setup_wizard_title"
                 android:icon="@drawable/empty_icon"
                 android:clearTaskOnLaunch="true">
@@ -512,7 +515,7 @@
         </receiver>
 
         <activity android:name="Settings$UserDictionarySettingsActivity"
-                android:label="@string/user_dict_settings_titlebar"
+                android:label="@string/user_dict_settings_title"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
             <intent-filter>
@@ -522,7 +525,7 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.UserDictionarySettings" />
+                android:value="com.android.settings.inputmethod.UserDictionaryList" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/language_settings" />
             <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"
@@ -532,7 +535,7 @@
         </activity>
 
         <activity android:name=".inputmethod.UserDictionaryAddWordActivity"
-                  android:label="@string/user_dict_settings_titlebar"
+                  android:label="@string/user_dict_settings_title"
                   android:theme="@android:style/Theme.Holo.Dialog.NoActionBar"
                   android:windowSoftInputMode="stateVisible"
                   android:noHistory="true"
@@ -547,7 +550,7 @@
 
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="UserDictionarySettings"
-                android:label="@string/user_dict_settings_titlebar"
+                android:label="@string/user_dict_settings_title"
                 android:exported="true"
                 android:targetActivity="Settings$UserDictionarySettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -702,7 +705,7 @@
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/application_settings" />
         </activity-alias>
-        
+
         <!-- Provide direct entry into manage apps showing storage usage for apps.
              This is for compatibility with old shortcuts. -->
         <activity-alias android:name=".applications.StorageUse"
@@ -799,7 +802,8 @@
         <activity android:name="Settings$AppOpsSummaryActivity"
                 android:label="@string/app_ops_settings"
                 android:taskAffinity=""
-                android:excludeFromRecents="true">
+                android:excludeFromRecents="true"
+                android:enabled="false">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.APP_OPS_SETTINGS" />
@@ -813,8 +817,9 @@
                 android:resource="@id/application_settings" />
         </activity>
         -->
-        
+
         <activity android:name="Settings$LocationSettingsActivity"
+                android:uiOptions="splitActionBarWhenNarrow"
                 android:label="@string/location_settings_title"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:taskAffinity=""
@@ -822,13 +827,12 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
-                <action android:name="android.credentials.UNLOCK" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.LocationSettings" />
+                android:value="com.android.settings.location.LocationSettings" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/location_settings" />
         </activity>
@@ -851,6 +855,35 @@
                 android:resource="@id/security_settings" />
         </activity>
 
+        <activity android:name="MonitoringCertInfoActivity"
+                android:label="@string/ssl_ca_cert_dialog_title"
+                android:theme="@style/Transparent"
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="com.android.settings.MONITORING_CERT_INFO" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="Settings$TrustedCredentialsSettingsActivity"
+                android:label="@string/trusted_credentials"
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="com.android.settings.TRUSTED_CREDENTIALS" />
+                <action android:name="com.android.settings.TRUSTED_CREDENTIALS_USER" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.TrustedCredentialsSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/security_settings" />
+        </activity>
+
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="SecuritySettings"
                 android:label="@string/security_settings_title"
@@ -966,7 +999,22 @@
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.AccessibilitySettings" />
+                android:value="com.android.settings.accessibility.AccessibilitySettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/accessibility_settings" />
+        </activity>
+
+        <activity android:name="Settings$CaptioningSettingsActivity"
+                android:label="@string/accessibility_captioning_title"
+                android:taskAffinity="com.android.settings"
+                android:parentActivityName="Settings$AccessibilitySettingsActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.CAPTIONING_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.accessibility.ToggleCaptioningPreferenceFragment" />
             <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                 android:resource="@id/accessibility_settings" />
         </activity>
@@ -988,7 +1036,6 @@
 
         <!-- Second and third-level settings -->
 
-
         <!-- Lock screen settings -->
         <activity android:name="ConfirmLockPattern"/>
 
@@ -1004,6 +1051,11 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="ChooseLockGeneric$InternalActivity" android:exported="false"
+            android:label="@string/lockpassword_choose_lock_generic_header"
+            android:excludeFromRecents="true"
+        />
+
         <activity android:name="ChooseLockPattern" android:exported="false"/>
 
         <activity android:name="ChooseLockPassword" android:exported="false"
@@ -1097,6 +1149,37 @@
                 android:resource="@id/development_settings" />
         </activity>
 
+        <activity android:name="Settings$PrintSettingsActivity"
+                android:label="@string/print_settings"
+                android:taskAffinity="com.android.settings"
+                android:parentActivityName="Settings">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.ACTION_PRINT_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.print.PrintSettingsFragment" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/print_settings" />
+        </activity>
+
+        <activity android:name="Settings$PrintJobSettingsActivity"
+                android:label="@string/print_print_job"
+                android:taskAffinity="com.android.settings"
+                android:parentActivityName="Settings$PrintSettingsActivity">
+            <intent-filter>
+                <action android:name="android.settings.ACTION_PRINT_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="printjob" android:pathPattern="*" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.print.PrintJobSettingsFragment" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/print_settings" />
+        </activity>
+
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name="DevelopmentSettings"
                   android:exported="true"
@@ -1554,6 +1637,41 @@
                 android:resource="@id/user_settings" />
         </activity>
 
+        <activity android:name="Settings$PaymentSettingsActivity"
+                android:uiOptions="splitActionBarWhenNarrow"
+                android:label="@string/nfc_payment_settings_title"
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.NFC_PAYMENT_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.nfc.PaymentSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/nfc_payment_settings" />
+        </activity>
+        <activity android:name=".nfc.PaymentDefaultDialog"
+                  android:label="@string/nfc_payment_set_default_label"
+                  android:excludeFromRecents="true"
+                  android:theme="@*android:style/Theme.Holo.Light.Dialog.Alert">
+            <intent-filter>
+                <action android:name="android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".SmsDefaultDialog"
+                  android:label="@string/sms_application_title"
+                  android:excludeFromRecents="true"
+                  android:theme="@*android:style/Theme.Holo.Light.Dialog.Alert">
+            <intent-filter>
+                <action android:name="android.provider.Telephony.ACTION_CHANGE_DEFAULT" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="Settings$NotificationAccessSettingsActivity"
                   android:label="@string/manage_notification_access"
                   android:taskAffinity=""
@@ -1591,7 +1709,7 @@
                 <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
                 <action android:name="android.net.conn.BACKGROUND_DATA_SETTING_CHANGED" />
                 <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
-                <action android:name="android.location.PROVIDERS_CHANGED" />
+                <action android:name="android.location.MODE_CHANGED" />
                 <action android:name="com.android.sync.SYNC_CONN_STATUS_CHANGED" />
             </intent-filter>
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />
@@ -1610,5 +1728,14 @@
             </intent-filter>
         </receiver>
 
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="com.android.settings.files"
+            android:grantUriPermissions="true"
+            android:exported="false">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
     </application>
 </manifest>
diff --git a/proguard.flags b/proguard.flags
index 8a6c2cbd939..211a5a4033a 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -13,6 +13,7 @@
 -keep class com.android.settings.fuelgauge.*
 -keep class com.android.settings.users.*
 -keep class com.android.settings.NotificationStation
+-keep class com.android.settings.nfc.*
 
 # Keep click responders
 -keepclassmembers class com.android.settings.inputmethod.UserDictionaryAddWordActivity {
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png
index 470f5c03897..de40bd08503 100644
Binary files a/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png and b/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png differ
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png
index e3aa8db1a37..73ebdb888ab 100644
Binary files a/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png and b/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png differ
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png
index 9e27d2fdc79..e1d6138e9ae 100644
Binary files a/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png and b/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png differ
diff --git a/res/drawable-hdpi/appwidget_item_bg_pressed.9.png b/res/drawable-hdpi/appwidget_item_bg_pressed.9.png
index 0da4a1d3462..785dbaad9f1 100644
Binary files a/res/drawable-hdpi/appwidget_item_bg_pressed.9.png and b/res/drawable-hdpi/appwidget_item_bg_pressed.9.png differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_gps_off_holo.png b/res/drawable-hdpi/ic_appwidget_settings_gps_off_holo.png
deleted file mode 100644
index cd3c61e2f6e..00000000000
Binary files a/res/drawable-hdpi/ic_appwidget_settings_gps_off_holo.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_gps_on_holo.png b/res/drawable-hdpi/ic_appwidget_settings_gps_on_holo.png
deleted file mode 100644
index 5138b70a175..00000000000
Binary files a/res/drawable-hdpi/ic_appwidget_settings_gps_on_holo.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_location_off_holo.png b/res/drawable-hdpi/ic_appwidget_settings_location_off_holo.png
new file mode 100644
index 00000000000..831c87ab287
Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_location_off_holo.png differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_location_on_holo.png b/res/drawable-hdpi/ic_appwidget_settings_location_on_holo.png
new file mode 100644
index 00000000000..5ece2310d9b
Binary files /dev/null and b/res/drawable-hdpi/ic_appwidget_settings_location_on_holo.png differ
diff --git a/res/drawable-hdpi/ic_grayedout_printer.png b/res/drawable-hdpi/ic_grayedout_printer.png
new file mode 100644
index 00000000000..5e54970d6b3
Binary files /dev/null and b/res/drawable-hdpi/ic_grayedout_printer.png differ
diff --git a/res/drawable-hdpi/ic_menu_add.png b/res/drawable-hdpi/ic_menu_add.png
deleted file mode 100644
index 4b68f52ad0a..00000000000
Binary files a/res/drawable-hdpi/ic_menu_add.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_add_dark.png b/res/drawable-hdpi/ic_menu_add_dark.png
new file mode 100644
index 00000000000..b45001e55a6
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_add_dark.png differ
diff --git a/res/drawable-hdpi/ic_menu_add_light.png b/res/drawable-hdpi/ic_menu_add_light.png
new file mode 100644
index 00000000000..91b035402ac
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_add_light.png differ
diff --git a/res/drawable-hdpi/ic_settings_home.png b/res/drawable-hdpi/ic_settings_home.png
new file mode 100644
index 00000000000..ce1a06c9a90
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_home.png differ
diff --git a/res/drawable-hdpi/ic_settings_location.png b/res/drawable-hdpi/ic_settings_location.png
index dcd0f4eaaa8..22d2deaf0c7 100644
Binary files a/res/drawable-hdpi/ic_settings_location.png and b/res/drawable-hdpi/ic_settings_location.png differ
diff --git a/res/drawable-hdpi/ic_settings_nfc_payment.png b/res/drawable-hdpi/ic_settings_nfc_payment.png
new file mode 100644
index 00000000000..7b63e536d8d
Binary files /dev/null and b/res/drawable-hdpi/ic_settings_nfc_payment.png differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1.png b/res/drawable-hdpi/ic_wifi_lock_signal_1.png
deleted file mode 100644
index 60857b3b7ac..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_1.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png
new file mode 100644
index 00000000000..2ec38ae5a87
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png
new file mode 100644
index 00000000000..8b0009b1446
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2.png b/res/drawable-hdpi/ic_wifi_lock_signal_2.png
deleted file mode 100644
index 5e1f118a5b8..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_2.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png
new file mode 100644
index 00000000000..a3383a84bc8
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png
new file mode 100644
index 00000000000..b79d3e5e726
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3.png b/res/drawable-hdpi/ic_wifi_lock_signal_3.png
deleted file mode 100644
index 490bd584dc9..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_3.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png
new file mode 100644
index 00000000000..e2cb17ecdc3
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png
new file mode 100644
index 00000000000..053c7afc419
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4.png b/res/drawable-hdpi/ic_wifi_lock_signal_4.png
deleted file mode 100644
index e5fa8d1c0b0..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_lock_signal_4.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png
new file mode 100644
index 00000000000..65b02dde1ba
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png
new file mode 100644
index 00000000000..0516bd46e41
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_1.png b/res/drawable-hdpi/ic_wifi_signal_1.png
deleted file mode 100644
index de9162ba567..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_signal_1.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_1_dark.png b/res/drawable-hdpi/ic_wifi_signal_1_dark.png
new file mode 100644
index 00000000000..f3f020843e4
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_1_dark.png differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_1_light.png b/res/drawable-hdpi/ic_wifi_signal_1_light.png
new file mode 100644
index 00000000000..d9968b93f79
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_1_light.png differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_2.png b/res/drawable-hdpi/ic_wifi_signal_2.png
deleted file mode 100644
index 4c7559c3df8..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_signal_2.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_2_dark.png b/res/drawable-hdpi/ic_wifi_signal_2_dark.png
new file mode 100644
index 00000000000..9541c38da13
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_2_dark.png differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_2_light.png b/res/drawable-hdpi/ic_wifi_signal_2_light.png
new file mode 100644
index 00000000000..d3065dead40
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_2_light.png differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_3.png b/res/drawable-hdpi/ic_wifi_signal_3.png
deleted file mode 100644
index 2d763246b8f..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_signal_3.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_3_dark.png b/res/drawable-hdpi/ic_wifi_signal_3_dark.png
new file mode 100644
index 00000000000..be1ba376132
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_3_dark.png differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_3_light.png b/res/drawable-hdpi/ic_wifi_signal_3_light.png
new file mode 100644
index 00000000000..4a6407fd67b
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_3_light.png differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_4.png b/res/drawable-hdpi/ic_wifi_signal_4.png
deleted file mode 100644
index bd50fd7d14f..00000000000
Binary files a/res/drawable-hdpi/ic_wifi_signal_4.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_4_dark.png b/res/drawable-hdpi/ic_wifi_signal_4_dark.png
new file mode 100644
index 00000000000..3fed8e63803
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_4_dark.png differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_4_light.png b/res/drawable-hdpi/ic_wifi_signal_4_light.png
new file mode 100644
index 00000000000..e52acd6f446
Binary files /dev/null and b/res/drawable-hdpi/ic_wifi_signal_4_light.png differ
diff --git a/res/drawable-hdpi/ic_wps.png b/res/drawable-hdpi/ic_wps.png
deleted file mode 100644
index 36c2a327f57..00000000000
Binary files a/res/drawable-hdpi/ic_wps.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_wps_dark.png b/res/drawable-hdpi/ic_wps_dark.png
new file mode 100644
index 00000000000..918b0cc48bc
Binary files /dev/null and b/res/drawable-hdpi/ic_wps_dark.png differ
diff --git a/res/drawable-hdpi/ic_wps_light.png b/res/drawable-hdpi/ic_wps_light.png
new file mode 100644
index 00000000000..5ad9f3eaeaf
Binary files /dev/null and b/res/drawable-hdpi/ic_wps_light.png differ
diff --git a/res/drawable-hdpi/nfc_payment_empty_state.png b/res/drawable-hdpi/nfc_payment_empty_state.png
new file mode 100644
index 00000000000..300a053ed09
Binary files /dev/null and b/res/drawable-hdpi/nfc_payment_empty_state.png differ
diff --git a/res/drawable-hdpi/transparency.png b/res/drawable-hdpi/transparency.png
new file mode 100644
index 00000000000..990c411b8be
Binary files /dev/null and b/res/drawable-hdpi/transparency.png differ
diff --git a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_1.png b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_1.png
deleted file mode 100644
index 5806c4f7925..00000000000
Binary files a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_1.png and /dev/null differ
diff --git a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_2.png b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_2.png
deleted file mode 100644
index c3a1d91aace..00000000000
Binary files a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_2.png and /dev/null differ
diff --git a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_3.png b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_3.png
deleted file mode 100644
index 36ea00156f6..00000000000
Binary files a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_3.png and /dev/null differ
diff --git a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_4.png b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_4.png
deleted file mode 100644
index 6c4f25254d4..00000000000
Binary files a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_4.png and /dev/null differ
diff --git a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_1.png b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_1.png
deleted file mode 100644
index 3f635f8b3ac..00000000000
Binary files a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_1.png and /dev/null differ
diff --git a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_2.png b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_2.png
deleted file mode 100644
index 04aae2d3849..00000000000
Binary files a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_2.png and /dev/null differ
diff --git a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_3.png b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_3.png
deleted file mode 100644
index 17609df4708..00000000000
Binary files a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_3.png and /dev/null differ
diff --git a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_4.png b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_4.png
deleted file mode 100644
index 90a8e27d92d..00000000000
Binary files a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_4.png and /dev/null differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_1.png b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_1.png
deleted file mode 100644
index 0e124bd6746..00000000000
Binary files a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_1.png and /dev/null differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_2.png b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_2.png
deleted file mode 100644
index d97d5d43d2b..00000000000
Binary files a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_2.png and /dev/null differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_3.png b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_3.png
deleted file mode 100644
index 99a8384fbfc..00000000000
Binary files a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_3.png and /dev/null differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_4.png b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_4.png
deleted file mode 100644
index 40307f82fea..00000000000
Binary files a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_4.png and /dev/null differ
diff --git a/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png
index aa80a7c70e7..79636c069da 100644
Binary files a/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png and b/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png differ
diff --git a/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png
index e49e8a9b89d..ac2c80a09fa 100644
Binary files a/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png and b/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png differ
diff --git a/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png
index a54ecd0da36..87e21cc0105 100644
Binary files a/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png and b/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png differ
diff --git a/res/drawable-mdpi/appwidget_item_bg_pressed.9.png b/res/drawable-mdpi/appwidget_item_bg_pressed.9.png
index 9a5001b45ef..df1be8d22af 100644
Binary files a/res/drawable-mdpi/appwidget_item_bg_pressed.9.png and b/res/drawable-mdpi/appwidget_item_bg_pressed.9.png differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_gps_off_holo.png b/res/drawable-mdpi/ic_appwidget_settings_gps_off_holo.png
deleted file mode 100644
index 64427202405..00000000000
Binary files a/res/drawable-mdpi/ic_appwidget_settings_gps_off_holo.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_gps_on_holo.png b/res/drawable-mdpi/ic_appwidget_settings_gps_on_holo.png
deleted file mode 100644
index 9e98ad9eda9..00000000000
Binary files a/res/drawable-mdpi/ic_appwidget_settings_gps_on_holo.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_location_off_holo.png b/res/drawable-mdpi/ic_appwidget_settings_location_off_holo.png
new file mode 100644
index 00000000000..c5906111c08
Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_location_off_holo.png differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_location_on_holo.png b/res/drawable-mdpi/ic_appwidget_settings_location_on_holo.png
new file mode 100644
index 00000000000..dbdb9ebd727
Binary files /dev/null and b/res/drawable-mdpi/ic_appwidget_settings_location_on_holo.png differ
diff --git a/res/drawable-mdpi/ic_grayedout_printer.png b/res/drawable-mdpi/ic_grayedout_printer.png
new file mode 100644
index 00000000000..5e54970d6b3
Binary files /dev/null and b/res/drawable-mdpi/ic_grayedout_printer.png differ
diff --git a/res/drawable-mdpi/ic_menu_add.png b/res/drawable-mdpi/ic_menu_add.png
deleted file mode 100644
index 15ffadd3606..00000000000
Binary files a/res/drawable-mdpi/ic_menu_add.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_add_dark.png b/res/drawable-mdpi/ic_menu_add_dark.png
new file mode 100644
index 00000000000..e6add2b291e
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_add_dark.png differ
diff --git a/res/drawable-mdpi/ic_menu_add_light.png b/res/drawable-mdpi/ic_menu_add_light.png
new file mode 100644
index 00000000000..8b558100eea
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_add_light.png differ
diff --git a/res/drawable-mdpi/ic_settings_home.png b/res/drawable-mdpi/ic_settings_home.png
new file mode 100644
index 00000000000..05b5e4d2ecf
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_home.png differ
diff --git a/res/drawable-mdpi/ic_settings_location.png b/res/drawable-mdpi/ic_settings_location.png
index 07b9f27a99a..3e1603353a7 100644
Binary files a/res/drawable-mdpi/ic_settings_location.png and b/res/drawable-mdpi/ic_settings_location.png differ
diff --git a/res/drawable-mdpi/ic_settings_nfc_payment.png b/res/drawable-mdpi/ic_settings_nfc_payment.png
new file mode 100644
index 00000000000..c3101bc6168
Binary files /dev/null and b/res/drawable-mdpi/ic_settings_nfc_payment.png differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1.png b/res/drawable-mdpi/ic_wifi_lock_signal_1.png
deleted file mode 100644
index e8ac823bfa6..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_1.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png
new file mode 100644
index 00000000000..d6868aa2874
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png
new file mode 100644
index 00000000000..eb41a107b6f
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2.png b/res/drawable-mdpi/ic_wifi_lock_signal_2.png
deleted file mode 100644
index 6034a89b6fc..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_2.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png
new file mode 100644
index 00000000000..ada9739f54a
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png
new file mode 100644
index 00000000000..ff041c42caa
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3.png b/res/drawable-mdpi/ic_wifi_lock_signal_3.png
deleted file mode 100644
index 0089a55d0c3..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_3.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png
new file mode 100644
index 00000000000..0a294ff2d51
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png
new file mode 100644
index 00000000000..98cf1ff8d79
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4.png b/res/drawable-mdpi/ic_wifi_lock_signal_4.png
deleted file mode 100644
index ae02f2428a8..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_lock_signal_4.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png
new file mode 100644
index 00000000000..ccda2c7726c
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png
new file mode 100644
index 00000000000..83af4de0677
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_1.png b/res/drawable-mdpi/ic_wifi_signal_1.png
deleted file mode 100644
index e99a47d250e..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_signal_1.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_1_dark.png b/res/drawable-mdpi/ic_wifi_signal_1_dark.png
new file mode 100644
index 00000000000..6715c5d89d1
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_1_dark.png differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_1_light.png b/res/drawable-mdpi/ic_wifi_signal_1_light.png
new file mode 100644
index 00000000000..eec60c0a92d
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_1_light.png differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_2.png b/res/drawable-mdpi/ic_wifi_signal_2.png
deleted file mode 100644
index 79516ea196f..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_signal_2.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_2_dark.png b/res/drawable-mdpi/ic_wifi_signal_2_dark.png
new file mode 100644
index 00000000000..e31d19f0489
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_2_dark.png differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_2_light.png b/res/drawable-mdpi/ic_wifi_signal_2_light.png
new file mode 100644
index 00000000000..7caa144d09a
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_2_light.png differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_3.png b/res/drawable-mdpi/ic_wifi_signal_3.png
deleted file mode 100644
index f2af11d382e..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_signal_3.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_3_dark.png b/res/drawable-mdpi/ic_wifi_signal_3_dark.png
new file mode 100644
index 00000000000..bd6a1e8c039
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_3_dark.png differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_3_light.png b/res/drawable-mdpi/ic_wifi_signal_3_light.png
new file mode 100644
index 00000000000..7be25151736
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_3_light.png differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_4.png b/res/drawable-mdpi/ic_wifi_signal_4.png
deleted file mode 100644
index 3d4288ea2c8..00000000000
Binary files a/res/drawable-mdpi/ic_wifi_signal_4.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_4_dark.png b/res/drawable-mdpi/ic_wifi_signal_4_dark.png
new file mode 100644
index 00000000000..af125c2465b
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_4_dark.png differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_4_light.png b/res/drawable-mdpi/ic_wifi_signal_4_light.png
new file mode 100644
index 00000000000..658761a41a6
Binary files /dev/null and b/res/drawable-mdpi/ic_wifi_signal_4_light.png differ
diff --git a/res/drawable-mdpi/ic_wps.png b/res/drawable-mdpi/ic_wps.png
deleted file mode 100644
index e522e9774a6..00000000000
Binary files a/res/drawable-mdpi/ic_wps.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_wps_dark.png b/res/drawable-mdpi/ic_wps_dark.png
new file mode 100644
index 00000000000..77d73a808cd
Binary files /dev/null and b/res/drawable-mdpi/ic_wps_dark.png differ
diff --git a/res/drawable-mdpi/ic_wps_light.png b/res/drawable-mdpi/ic_wps_light.png
new file mode 100644
index 00000000000..ef560fa5c39
Binary files /dev/null and b/res/drawable-mdpi/ic_wps_light.png differ
diff --git a/res/drawable-mdpi/nfc_payment_empty_state.png b/res/drawable-mdpi/nfc_payment_empty_state.png
new file mode 100644
index 00000000000..28a1e31c962
Binary files /dev/null and b/res/drawable-mdpi/nfc_payment_empty_state.png differ
diff --git a/res/drawable-mdpi/transparency.png b/res/drawable-mdpi/transparency.png
new file mode 100644
index 00000000000..a915df31f23
Binary files /dev/null and b/res/drawable-mdpi/transparency.png differ
diff --git a/res/drawable-nodpi/caption_background.jpg b/res/drawable-nodpi/caption_background.jpg
new file mode 100644
index 00000000000..0c5503a0006
Binary files /dev/null and b/res/drawable-nodpi/caption_background.jpg differ
diff --git a/res/drawable-nodpi/preview.png b/res/drawable-nodpi/preview.png
index 10a7c9023cc..d06adc1988e 100644
Binary files a/res/drawable-nodpi/preview.png and b/res/drawable-nodpi/preview.png differ
diff --git a/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png
index defdbb9c00b..45d93010dff 100644
Binary files a/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png and b/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png differ
diff --git a/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png
index 582d0e19738..35ae2c86e3c 100644
Binary files a/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png and b/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png differ
diff --git a/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png
index 9732dd7c556..06419a1d33a 100644
Binary files a/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png and b/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png differ
diff --git a/res/drawable-xhdpi/appwidget_item_bg_pressed.9.png b/res/drawable-xhdpi/appwidget_item_bg_pressed.9.png
index 3160e858c0f..80d9bfbee16 100644
Binary files a/res/drawable-xhdpi/appwidget_item_bg_pressed.9.png and b/res/drawable-xhdpi/appwidget_item_bg_pressed.9.png differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_gps_off_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_gps_off_holo.png
deleted file mode 100644
index 0548274008f..00000000000
Binary files a/res/drawable-xhdpi/ic_appwidget_settings_gps_off_holo.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_gps_on_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_gps_on_holo.png
deleted file mode 100644
index d1d97685d63..00000000000
Binary files a/res/drawable-xhdpi/ic_appwidget_settings_gps_on_holo.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_location_off_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_location_off_holo.png
new file mode 100644
index 00000000000..dfaa6c30071
Binary files /dev/null and b/res/drawable-xhdpi/ic_appwidget_settings_location_off_holo.png differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_location_on_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_location_on_holo.png
new file mode 100644
index 00000000000..bb00da6bf44
Binary files /dev/null and b/res/drawable-xhdpi/ic_appwidget_settings_location_on_holo.png differ
diff --git a/res/drawable-xhdpi/ic_grayedout_printer.png b/res/drawable-xhdpi/ic_grayedout_printer.png
new file mode 100644
index 00000000000..5e54970d6b3
Binary files /dev/null and b/res/drawable-xhdpi/ic_grayedout_printer.png differ
diff --git a/res/drawable-xhdpi/ic_menu_add.png b/res/drawable-xhdpi/ic_menu_add.png
deleted file mode 100644
index 420510e935c..00000000000
Binary files a/res/drawable-xhdpi/ic_menu_add.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_menu_add_dark.png b/res/drawable-xhdpi/ic_menu_add_dark.png
new file mode 100644
index 00000000000..6e2e18a04b9
Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_add_dark.png differ
diff --git a/res/drawable-xhdpi/ic_menu_add_light.png b/res/drawable-xhdpi/ic_menu_add_light.png
new file mode 100644
index 00000000000..4109b2ca666
Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_add_light.png differ
diff --git a/res/drawable-xhdpi/ic_settings_home.png b/res/drawable-xhdpi/ic_settings_home.png
new file mode 100644
index 00000000000..6a4d84a6826
Binary files /dev/null and b/res/drawable-xhdpi/ic_settings_home.png differ
diff --git a/res/drawable-xhdpi/ic_settings_location.png b/res/drawable-xhdpi/ic_settings_location.png
index 29ed43cd8a3..a3912a37553 100644
Binary files a/res/drawable-xhdpi/ic_settings_location.png and b/res/drawable-xhdpi/ic_settings_location.png differ
diff --git a/res/drawable-xhdpi/ic_settings_nfc_payment.png b/res/drawable-xhdpi/ic_settings_nfc_payment.png
new file mode 100644
index 00000000000..e4d81735451
Binary files /dev/null and b/res/drawable-xhdpi/ic_settings_nfc_payment.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1.png
deleted file mode 100644
index 8b8cb03d34e..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_1.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png
new file mode 100644
index 00000000000..c2be32fc681
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png
new file mode 100644
index 00000000000..57c8fb29c44
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2.png
deleted file mode 100644
index 411269c53b2..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_2.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png
new file mode 100644
index 00000000000..9e65730d0ab
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png
new file mode 100644
index 00000000000..db783f81c16
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3.png
deleted file mode 100644
index f0d92a05572..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_3.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png
new file mode 100644
index 00000000000..5a12175f5ab
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png
new file mode 100644
index 00000000000..8b7df74d8be
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4.png
deleted file mode 100644
index d26694d7af2..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_lock_signal_4.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png
new file mode 100644
index 00000000000..4d2942c69b3
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png
new file mode 100644
index 00000000000..bf26501a1b4
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_1.png b/res/drawable-xhdpi/ic_wifi_signal_1.png
deleted file mode 100644
index 3fded085f44..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_signal_1.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_1_dark.png b/res/drawable-xhdpi/ic_wifi_signal_1_dark.png
new file mode 100644
index 00000000000..bf1634cd122
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_1_dark.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_1_light.png b/res/drawable-xhdpi/ic_wifi_signal_1_light.png
new file mode 100644
index 00000000000..0f58f3d5f20
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_1_light.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_2.png b/res/drawable-xhdpi/ic_wifi_signal_2.png
deleted file mode 100644
index 3a32026d33c..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_signal_2.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_2_dark.png b/res/drawable-xhdpi/ic_wifi_signal_2_dark.png
new file mode 100644
index 00000000000..5345ff30b4d
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_2_dark.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_2_light.png b/res/drawable-xhdpi/ic_wifi_signal_2_light.png
new file mode 100644
index 00000000000..c5bcc7e6a93
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_2_light.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_3.png b/res/drawable-xhdpi/ic_wifi_signal_3.png
deleted file mode 100644
index 161694093c2..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_signal_3.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_3_dark.png b/res/drawable-xhdpi/ic_wifi_signal_3_dark.png
new file mode 100644
index 00000000000..8cc3a6ea1bb
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_3_dark.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_3_light.png b/res/drawable-xhdpi/ic_wifi_signal_3_light.png
new file mode 100644
index 00000000000..1cdacc5af08
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_3_light.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_4.png b/res/drawable-xhdpi/ic_wifi_signal_4.png
deleted file mode 100644
index 8b256c32526..00000000000
Binary files a/res/drawable-xhdpi/ic_wifi_signal_4.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_4_dark.png b/res/drawable-xhdpi/ic_wifi_signal_4_dark.png
new file mode 100644
index 00000000000..c9aa4e58110
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_4_dark.png differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_4_light.png b/res/drawable-xhdpi/ic_wifi_signal_4_light.png
new file mode 100644
index 00000000000..3cf1c8da2a7
Binary files /dev/null and b/res/drawable-xhdpi/ic_wifi_signal_4_light.png differ
diff --git a/res/drawable-xhdpi/ic_wps.png b/res/drawable-xhdpi/ic_wps.png
deleted file mode 100644
index 71308f213f9..00000000000
Binary files a/res/drawable-xhdpi/ic_wps.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_wps_dark.png b/res/drawable-xhdpi/ic_wps_dark.png
new file mode 100644
index 00000000000..3ea4a3b6bcb
Binary files /dev/null and b/res/drawable-xhdpi/ic_wps_dark.png differ
diff --git a/res/drawable-xhdpi/ic_wps_light.png b/res/drawable-xhdpi/ic_wps_light.png
new file mode 100644
index 00000000000..f913d2c00ea
Binary files /dev/null and b/res/drawable-xhdpi/ic_wps_light.png differ
diff --git a/res/drawable-xhdpi/nfc_payment_empty_state.png b/res/drawable-xhdpi/nfc_payment_empty_state.png
new file mode 100644
index 00000000000..e66409084b3
Binary files /dev/null and b/res/drawable-xhdpi/nfc_payment_empty_state.png differ
diff --git a/res/drawable-xhdpi/transparency.png b/res/drawable-xhdpi/transparency.png
new file mode 100644
index 00000000000..0808625aeb1
Binary files /dev/null and b/res/drawable-xhdpi/transparency.png differ
diff --git a/res/drawable-xxhdpi/appwidget_item_bg_pressed.9.png b/res/drawable-xxhdpi/appwidget_item_bg_pressed.9.png
new file mode 100644
index 00000000000..a3427e85add
Binary files /dev/null and b/res/drawable-xxhdpi/appwidget_item_bg_pressed.9.png differ
diff --git a/res/drawable-xxhdpi/ic_appwidget_settings_location_off_holo.png b/res/drawable-xxhdpi/ic_appwidget_settings_location_off_holo.png
new file mode 100644
index 00000000000..d2fc839b137
Binary files /dev/null and b/res/drawable-xxhdpi/ic_appwidget_settings_location_off_holo.png differ
diff --git a/res/drawable-xxhdpi/ic_appwidget_settings_location_on_holo.png b/res/drawable-xxhdpi/ic_appwidget_settings_location_on_holo.png
new file mode 100644
index 00000000000..893eb82a0e3
Binary files /dev/null and b/res/drawable-xxhdpi/ic_appwidget_settings_location_on_holo.png differ
diff --git a/res/drawable-xxhdpi/ic_menu_add_dark.png b/res/drawable-xxhdpi/ic_menu_add_dark.png
new file mode 100644
index 00000000000..5b4923fdabb
Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_add_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_menu_add_light.png b/res/drawable-xxhdpi/ic_menu_add_light.png
new file mode 100644
index 00000000000..767b8080127
Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_add_light.png differ
diff --git a/res/drawable-xxhdpi/ic_settings_about.png b/res/drawable-xxhdpi/ic_settings_about.png
new file mode 100644
index 00000000000..924d96264c1
Binary files /dev/null and b/res/drawable-xxhdpi/ic_settings_about.png differ
diff --git a/res/drawable-xxhdpi/ic_settings_home.png b/res/drawable-xxhdpi/ic_settings_home.png
new file mode 100644
index 00000000000..aac8773fda5
Binary files /dev/null and b/res/drawable-xxhdpi/ic_settings_home.png differ
diff --git a/res/drawable-xxhdpi/ic_settings_location.png b/res/drawable-xxhdpi/ic_settings_location.png
new file mode 100644
index 00000000000..72499efd316
Binary files /dev/null and b/res/drawable-xxhdpi/ic_settings_location.png differ
diff --git a/res/drawable-xxhdpi/ic_settings_nfc_payment.png b/res/drawable-xxhdpi/ic_settings_nfc_payment.png
new file mode 100644
index 00000000000..cdb495e8e86
Binary files /dev/null and b/res/drawable-xxhdpi/ic_settings_nfc_payment.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png
new file mode 100644
index 00000000000..20739fab9f8
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png
new file mode 100644
index 00000000000..c13edffdb1c
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png
new file mode 100644
index 00000000000..9cd652a4d4a
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png
new file mode 100644
index 00000000000..cb7f0c254c0
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png
new file mode 100644
index 00000000000..99097df39f2
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png
new file mode 100644
index 00000000000..a0961f4c6a9
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png
new file mode 100644
index 00000000000..6c00a9c9c15
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png
new file mode 100644
index 00000000000..74e1a40116f
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png
new file mode 100644
index 00000000000..b50fda532ae
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_1_light.png b/res/drawable-xxhdpi/ic_wifi_signal_1_light.png
new file mode 100644
index 00000000000..f6fad9d94b1
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_1_light.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png
new file mode 100644
index 00000000000..f90602321b0
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_2_light.png b/res/drawable-xxhdpi/ic_wifi_signal_2_light.png
new file mode 100644
index 00000000000..7f5859b40d0
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_2_light.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png
new file mode 100644
index 00000000000..ef40952905c
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_3_light.png b/res/drawable-xxhdpi/ic_wifi_signal_3_light.png
new file mode 100644
index 00000000000..e3151b33f8b
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_3_light.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png
new file mode 100644
index 00000000000..13f94251153
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_4_light.png b/res/drawable-xxhdpi/ic_wifi_signal_4_light.png
new file mode 100644
index 00000000000..96e25e5f5cf
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wifi_signal_4_light.png differ
diff --git a/res/drawable-xxhdpi/ic_wps_dark.png b/res/drawable-xxhdpi/ic_wps_dark.png
new file mode 100644
index 00000000000..8b38db86f79
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wps_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_wps_light.png b/res/drawable-xxhdpi/ic_wps_light.png
new file mode 100644
index 00000000000..00841755b76
Binary files /dev/null and b/res/drawable-xxhdpi/ic_wps_light.png differ
diff --git a/res/drawable-xxhdpi/nfc_payment_empty_state.png b/res/drawable-xxhdpi/nfc_payment_empty_state.png
new file mode 100644
index 00000000000..a861b790f94
Binary files /dev/null and b/res/drawable-xxhdpi/nfc_payment_empty_state.png differ
diff --git a/res/drawable-xxhdpi/transparency.png b/res/drawable-xxhdpi/transparency.png
new file mode 100644
index 00000000000..5b61bac079f
Binary files /dev/null and b/res/drawable-xxhdpi/transparency.png differ
diff --git a/res/drawable/transparency_tileable.xml b/res/drawable/transparency_tileable.xml
new file mode 100644
index 00000000000..0f676b11a1f
--- /dev/null
+++ b/res/drawable/transparency_tileable.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/transparency"
+    android:tileMode="repeat"
+    android:dither="true" />
diff --git a/res/drawable/wifi_signal.xml b/res/drawable/wifi_signal_dark.xml
similarity index 93%
rename from res/drawable/wifi_signal.xml
rename to res/drawable/wifi_signal_dark.xml
index 86c1ab09916..b578f47761b 100644
--- a/res/drawable/wifi_signal.xml
+++ b/res/drawable/wifi_signal_dark.xml
@@ -16,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock" />
-    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open" />
+    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock_dark" />
+    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open_dark" />
 </selector>
 
diff --git a/res/drawable/wifi_signal_light.xml b/res/drawable/wifi_signal_light.xml
new file mode 100644
index 00000000000..f1f74e3105a
--- /dev/null
+++ b/res/drawable/wifi_signal_light.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock_light" />
+    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open_light" />
+</selector>
+
diff --git a/res/drawable/wifi_signal_lock_dark.xml b/res/drawable/wifi_signal_lock_dark.xml
new file mode 100644
index 00000000000..37226a808aa
--- /dev/null
+++ b/res/drawable/wifi_signal_lock_dark.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_lock_signal_1_dark" />
+    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_lock_signal_2_dark" />
+    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_lock_signal_3_dark" />
+    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_lock_signal_4_dark" />
+</level-list>
+
diff --git a/res/drawable/wifi_signal_lock_light.xml b/res/drawable/wifi_signal_lock_light.xml
new file mode 100644
index 00000000000..bf2d3604c83
--- /dev/null
+++ b/res/drawable/wifi_signal_lock_light.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_lock_signal_1_light" />
+    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_lock_signal_2_light" />
+    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_lock_signal_3_light" />
+    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_lock_signal_4_light" />
+</level-list>
+
diff --git a/res/drawable/wifi_signal_lock.xml b/res/drawable/wifi_signal_open_dark.xml
similarity index 92%
rename from res/drawable/wifi_signal_lock.xml
rename to res/drawable/wifi_signal_open_dark.xml
index 2ad6d91d260..d696983dc21 100644
--- a/res/drawable/wifi_signal_lock.xml
+++ b/res/drawable/wifi_signal_open_dark.xml
@@ -15,9 +15,9 @@
 -->
 
 <level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_lock_signal_1" />
-    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_lock_signal_2" />
-    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_lock_signal_3" />
-    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_lock_signal_4" />
+    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1_dark" />
+    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2_dark" />
+    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3_dark" />
+    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4_dark" />
 </level-list>
 
diff --git a/res/drawable/wifi_signal_open.xml b/res/drawable/wifi_signal_open_light.xml
similarity index 92%
rename from res/drawable/wifi_signal_open.xml
rename to res/drawable/wifi_signal_open_light.xml
index b506dd3349e..c54e9e93d78 100644
--- a/res/drawable/wifi_signal_open.xml
+++ b/res/drawable/wifi_signal_open_light.xml
@@ -15,9 +15,9 @@
 -->
 
 <level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1" />
-    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2" />
-    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3" />
-    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4" />
+    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1_light" />
+    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2_light" />
+    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3_light" />
+    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4_light" />
 </level-list>
 
diff --git a/res/layout-sw720dp/tab_widget.xml b/res/layout-sw720dp/tab_widget.xml
index f591f38a855..80910c7be8d 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:paddingStart="@*android:dimen/preference_fragment_padding_side"
-        android:paddingEnd="@*android:dimen/preference_fragment_padding_side"
-        style="?android:attr/tabWidgetStyle" />
-
+        style="?android:attr/tabWidgetStyle"
+        android:paddingStart="@dimen/settings_side_margin"
+        android:paddingEnd="@dimen/settings_side_margin"
+    />
 </HorizontalScrollView>
diff --git a/res/layout/account_sync_screen.xml b/res/layout/account_sync_screen.xml
index 4c1bf7ef50d..64697793e51 100644
--- a/res/layout/account_sync_screen.xml
+++ b/res/layout/account_sync_screen.xml
@@ -27,8 +27,8 @@
     <ImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
-        android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side"
+        android:layout_marginStart="@dimen/settings_side_margin"
+        android:layout_marginEnd="@dimen/settings_side_margin"
         android:scaleType="fitXY"
         android:src="?android:attr/listDivider" />
 
@@ -38,7 +38,7 @@
         android:layout_height="0dip"
         android:layout_weight="1"
         android:clipToPadding="false"
-        android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle" />
+        android:scrollbarStyle="outsideOverlay" />
 
     <TextView android:id="@+id/sync_settings_error_info"
         android:layout_width="match_parent"
diff --git a/res/layout/app_ops_details.xml b/res/layout/app_ops_details.xml
index d28689dc4aa..e3209ca91ad 100644
--- a/res/layout/app_ops_details.xml
+++ b/res/layout/app_ops_details.xml
@@ -21,7 +21,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
-    android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle">
+    android:scrollbarStyle="@integer/preference_scrollbar_style">
 
     <LinearLayout
         android:id="@+id/all_details"
diff --git a/res/layout/bluetooth_connection_access.xml b/res/layout/bluetooth_access.xml
similarity index 100%
rename from res/layout/bluetooth_connection_access.xml
rename to res/layout/bluetooth_access.xml
diff --git a/res/layout/bluetooth_pb_access.xml b/res/layout/bluetooth_pb_access.xml
deleted file mode 100644
index 01218d6593a..00000000000
--- a/res/layout/bluetooth_pb_access.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2009, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent">
-
-    <LinearLayout
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/message"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="20dip"
-            android:layout_marginEnd="20dip"
-            android:gravity="center_horizontal"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <CheckBox android:id="@+id/bluetooth_pb_remember_choice"
-            style="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="2dip"
-            android:text="@string/bluetooth_pb_remember_choice" />
-
-    </LinearLayout>
-
-</ScrollView>
diff --git a/res/layout/captioning_preview.xml b/res/layout/captioning_preview.xml
new file mode 100644
index 00000000000..00d94a0d8b6
--- /dev/null
+++ b/res/layout/captioning_preview.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/captioning_preview_height" >
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:contentDescription="@null"
+            android:scaleType="centerCrop"
+            android:src="@drawable/caption_background" />
+
+        <com.android.internal.widget.SubtitleView
+            android:id="@+id/preview_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|start"
+            android:layout_margin="16dp"
+            android:text="@string/captioning_preview_text" />
+    </FrameLayout>
+
+    <fragment
+        android:id="@+id/properties_fragment"
+        android:name="com.android.settings.accessibility.CaptionPropertiesFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/res/layout/color_picker_item.xml b/res/layout/color_picker_item.xml
new file mode 100644
index 00000000000..5599eb4796d
--- /dev/null
+++ b/res/layout/color_picker_item.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:paddingLeft="4dp"
+    android:paddingRight="4dp"
+    android:paddingTop="16dp" >
+
+    <ImageView
+        android:id="@+id/color_swatch"
+        android:layout_width="96dp"
+        android:layout_height="96dp"
+        android:contentDescription="@null" />
+
+    <TextView
+        android:id="@+id/summary"
+        android:layout_width="96dp"
+        android:layout_height="wrap_content"
+        android:gravity="center" />
+
+</LinearLayout>
diff --git a/res/layout/data_usage_summary.xml b/res/layout/data_usage_summary.xml
index b754d0ca6c2..1cad64837b0 100644
--- a/res/layout/data_usage_summary.xml
+++ b/res/layout/data_usage_summary.xml
@@ -29,16 +29,17 @@
 
         <!-- give an empty content area to make tabhost happy -->
         <FrameLayout
+            style="@style/PreferenceFragmentListSinglePane"
             android:id="@android:id/tabcontent"
             android:layout_width="0dip"
             android:layout_height="0dip" />
 
         <ListView
             android:id="@android:id/list"
+            style="@style/PreferenceFragmentListSinglePane"
             android:layout_width="match_parent"
             android:layout_height="0dip"
             android:layout_weight="1"
-            android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle"
             android:clipChildren="false"
             android:clipToPadding="false"
             android:smoothScrollbar="false" />
diff --git a/res/layout/empty_print_state.xml b/res/layout/empty_print_state.xml
new file mode 100644
index 00000000000..6a82703162b
--- /dev/null
+++ b/res/layout/empty_print_state.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/empty_print_state"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:visibility="gone">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dip"
+            android:src="@drawable/ic_grayedout_printer"
+            android:contentDescription="@null">
+        </ImageView>
+
+        <TextView
+            android:id="@+id/message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textColor="?android:attr/textColorSecondary"
+            android:importantForAccessibility="no">
+        </TextView>
+
+    </LinearLayout>
+
+</FrameLayout>
diff --git a/res/layout/empty_printers_list_service_enabled.xml b/res/layout/empty_printers_list_service_enabled.xml
new file mode 100644
index 00000000000..78c8b43ec5f
--- /dev/null
+++ b/res/layout/empty_printers_list_service_enabled.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/empty_printers_list_service_enabled"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:visibility="gone">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dip"
+            android:src="@drawable/ic_grayedout_printer"
+            android:contentDescription="@string/print_searching_for_printers">
+        </ImageView>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textColor="?android:attr/textColorSecondary"
+            android:text="@string/print_searching_for_printers">
+        </TextView>
+
+        <ProgressBar
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:indeterminate="true"
+            style="@android:style/Widget.Holo.ProgressBar.Horizontal">
+        </ProgressBar>
+
+    </LinearLayout>
+
+</FrameLayout>
diff --git a/res/layout/grid_picker_dialog.xml b/res/layout/grid_picker_dialog.xml
new file mode 100644
index 00000000000..a52f0791ea6
--- /dev/null
+++ b/res/layout/grid_picker_dialog.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <GridView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:columnWidth="112dp"
+        android:numColumns="auto_fit"
+        android:scrollbarStyle="insideOverlay"
+        android:stretchMode="spacingWidthUniform" />
+
+    <!-- HACK: Setting minHeight has no effect within a dialog layout,
+         so this view keeps the minimum height above 300dp. -->
+    <View
+        android:layout_width="0dp"
+        android:layout_height="300dp"
+        android:visibility="invisible" />
+
+</FrameLayout>
diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml
index b7f8f15b143..347c12b838f 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -21,7 +21,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
-    android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle">
+    android:scrollbarStyle="@integer/preference_scrollbar_style">
 
     <LinearLayout
         android:id="@+id/all_details"
diff --git a/res/layout/location_list_no_item.xml b/res/layout/location_list_no_item.xml
new file mode 100644
index 00000000000..5489a5031b0
--- /dev/null
+++ b/res/layout/location_list_no_item.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- text that appears when the recent app list is empty -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:background="?android:attr/selectableItemBackground" >
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="15dip"
+        android:layout_marginEnd="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1">
+
+        <TextView android:id="@+android:id/title"
+            android:gravity="center"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary" />
+
+    </RelativeLayout>
+
+</LinearLayout>
+
diff --git a/res/layout/manage_accounts_screen.xml b/res/layout/manage_accounts_screen.xml
index 3a2aa6a4614..12158b9c13c 100644
--- a/res/layout/manage_accounts_screen.xml
+++ b/res/layout/manage_accounts_screen.xml
@@ -28,7 +28,7 @@
         android:layout_height="0dip"
         android:layout_weight="1"
         android:clipToPadding="false"
-        android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle" />
+        android:scrollbarStyle="@integer/preference_scrollbar_style" />
 
     <TextView android:id="@+id/sync_settings_error_info"
         android:layout_width="match_parent"
diff --git a/res/layout/manage_applications_apps.xml b/res/layout/manage_applications_apps.xml
index 8a8ba0b4326..6f4bf107afd 100644
--- a/res/layout/manage_applications_apps.xml
+++ b/res/layout/manage_applications_apps.xml
@@ -31,7 +31,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:clipToPadding="false"
-                android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle" />
+                android:scrollbarStyle="@integer/preference_scrollbar_style" />
             <TextView android:id="@android:id/empty"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -39,8 +39,14 @@
                     android:text="@string/no_applications"
                     android:textAppearance="?android:attr/textAppearanceLarge" />
         </FrameLayout>
+        <!-- Force layout direction to LTR for now as we want the text to be at the same position in
+             any Locale included the RTL ones. Will need to fix LinearColorBar RTL support later.
+             Please also note the left/right gravities that would also need to be changed for proper
+             RTL support -->
         <view class="com.android.settings.applications.LinearColorBar"
                 android:id="@+id/storage_color_bar"
+                android:layout_marginStart="@dimen/settings_side_margin"
+                android:layout_marginEnd="@dimen/settings_side_margin"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="-5dp"
@@ -48,15 +54,13 @@
                 android:clipChildren="false"
                 android:clipToPadding="false"
                 android:paddingTop="30dp"
-                android:paddingStart="4dp"
-                android:paddingEnd="4dp"
                 android:paddingBottom="1dp"
-                android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
-                android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side">
+                android:layoutDirection="ltr">
             <TextView android:id="@+id/usedStorageText"
                 android:layout_width="0px"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:gravity="left"
                 android:textAppearance="?android:attr/textAppearanceSmallInverse"
                 android:textColor="#000"
                 android:singleLine="true" />
@@ -77,7 +81,7 @@
                 android:layout_width="0px"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:gravity="end"
+                android:gravity="right"
                 android:textAppearance="?android:attr/textAppearanceSmallInverse"
                 android:textColor="#000"
                 android:singleLine="true" />
@@ -88,8 +92,6 @@
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            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 9e415a9dbdc..90b2cbab69b 100644
--- a/res/layout/manage_applications_content.xml
+++ b/res/layout/manage_applications_content.xml
@@ -35,8 +35,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="top"
                 android:textAppearance="@style/TextAppearance.PagerTabs"
-                android:paddingLeft="@dimen/pager_tabs_padding"
-                android:paddingRight="@dimen/pager_tabs_padding">
+                android:padding="0dp">
         </android.support.v4.view.PagerTabStrip>
     </android.support.v4.view.ViewPager>
 
diff --git a/res/layout/manage_applications_running.xml b/res/layout/manage_applications_running.xml
index 0bc69fbc88c..352ce442e2e 100644
--- a/res/layout/manage_applications_running.xml
+++ b/res/layout/manage_applications_running.xml
@@ -27,8 +27,6 @@
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_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/nfc_payment.xml b/res/layout/nfc_payment.xml
new file mode 100644
index 00000000000..d6f9fa44f99
--- /dev/null
+++ b/res/layout/nfc_payment.xml
@@ -0,0 +1,45 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:orientation="vertical" >
+        <ImageView
+            android:id="@+id/nfc_payment_tap_image"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:visibility="gone"
+            android:src="@drawable/nfc_payment_empty_state"/>
+        <TextView
+            android:id="@+id/nfc_payment_empty_text"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textSize="24sp"
+            android:visibility="gone"
+            android:paddingTop="16dp"
+            android:text="@string/nfc_payment_no_apps"/>
+        <TextView
+            android:id="@+id/nfc_payment_learn_more"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:clickable="true"
+            android:textSize="20sp"
+            android:textStyle="italic"
+            android:visibility="gone"
+            android:textColor="@android:color/holo_blue_light"
+            android:paddingTop="16dp"
+            android:text="@string/nfc_payment_learn_more"/>
+    </LinearLayout>
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="5dp" />
+
+</FrameLayout>
diff --git a/res/layout/nfc_payment_option.xml b/res/layout/nfc_payment_option.xml
new file mode 100644
index 00000000000..04fdc076c35
--- /dev/null
+++ b/res/layout/nfc_payment_option.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_weight="1"
+    android:id="@+id/nfc_payment_pref"
+    android:focusable="true"
+    android:clickable="true"
+    android:gravity="center_vertical"
+    android:paddingTop="10dp"
+    android:paddingBottom="10dp"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:background="?android:attr/selectableItemBackground">
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:minWidth="@*android:dimen/preference_icon_minWidth"
+        android:orientation="horizontal">
+        <ImageView
+            android:id="@+id/banner"
+            android:layout_gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="96dp"
+            android:scaleType="centerInside"
+                />
+    </FrameLayout>
+    <RadioButton
+        android:id="@android:id/button1"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:duplicateParentState="true"
+        android:clickable="false"
+        android:focusable="false" />
+</RelativeLayout>
diff --git a/res/layout/power_usage_detail_item_text.xml b/res/layout/power_usage_detail_item_text.xml
index fb8c705ce7f..9c9c72c0958 100644
--- a/res/layout/power_usage_detail_item_text.xml
+++ b/res/layout/power_usage_detail_item_text.xml
@@ -26,10 +26,13 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textStyle="bold"
         android:singleLine="true"
+        android:ellipsize="middle"
         android:layout_alignParentStart="true"
+        android:layout_toStartOf="@+id/value"
         android:layout_marginBottom="4dip"
         android:layout_marginTop="4dip"
-        android:layout_marginStart="4dip" />
+        android:layout_marginStart="4dip"
+        android:layout_marginEnd="4dip"/>
     <TextView
         android:id="@+id/value"
         android:layout_width="wrap_content"
diff --git a/res/layout/power_usage_details.xml b/res/layout/power_usage_details.xml
index 05036da5256..ca65863786e 100644
--- a/res/layout/power_usage_details.xml
+++ b/res/layout/power_usage_details.xml
@@ -19,7 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
-    android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle">
+    android:scrollbarStyle="@integer/preference_scrollbar_style">
 
     <LinearLayout
         android:id="@+id/all_details"
diff --git a/res/layout/preference_app_restrictions.xml b/res/layout/preference_app_restrictions.xml
index a8a93d1322d..753099db168 100644
--- a/res/layout/preference_app_restrictions.xml
+++ b/res/layout/preference_app_restrictions.xml
@@ -19,8 +19,7 @@
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingStart="@*android:dimen/preference_item_padding_side"
-    android:paddingEnd="?android:attr/scrollbarSize">
+    android:paddingStart="@*android:dimen/preference_item_padding_side">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -101,7 +100,6 @@
         android:id="@android:id/widget_frame"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:paddingRight="?android:attr/scrollbarSize"
         android:gravity="center_vertical"
         android:orientation="vertical" />
 </LinearLayout>
diff --git a/res/layout/preference_color.xml b/res/layout/preference_color.xml
new file mode 100644
index 00000000000..de4b832e13b
--- /dev/null
+++ b/res/layout/preference_color.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/color_preview"
+    android:layout_width="?android:attr/listPreferredItemHeight"
+    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:contentDescription="@null" />
diff --git a/res/layout/preference_dialog_ringervolume.xml b/res/layout/preference_dialog_ringervolume.xml
index 1643cabe082..2af1ba9f99e 100644
--- a/res/layout/preference_dialog_ringervolume.xml
+++ b/res/layout/preference_dialog_ringervolume.xml
@@ -51,26 +51,34 @@
 
         <!-- Used for the media volume -->
         <LinearLayout
+                android:id="@+id/media_section"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="8dip"
-                android:orientation="horizontal"
-                android:gravity="center_vertical">
+                android:orientation="vertical">
 
-                <ImageView android:id="@+id/media_mute_button"
-                        android:layout_width="wrap_content"
+                <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:padding="16dip"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:contentDescription="@string/volume_media_mute"
-                    />
+                        android:paddingStart="8dip"
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical">
+
+                        <ImageView android:id="@+id/media_mute_button"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:padding="16dip"
+                                android:background="?android:attr/selectableItemBackground"
+                                android:contentDescription="@string/volume_media_mute"
+                            />
+
+                        <SeekBar android:id="@+id/media_volume_seekbar"
+                                android:layout_width="0dip"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:paddingTop="2dip"
+                                android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
+                </LinearLayout>
 
-                <SeekBar android:id="@+id/media_volume_seekbar"
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:paddingTop="2dip"
-                        android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
         </LinearLayout>
 
         <!-- Used for the ringer/notification volume -->
@@ -159,36 +167,45 @@
 
         </LinearLayout>
 
-        <TextView
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dip"
-                android:paddingStart="16dip"
-                android:layout_gravity="start"
-                android:text="@string/volume_alarm_description"
-            />
-
         <!-- Used for the alarm volume -->
         <LinearLayout
+                android:id="@+id/alarm_section"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="8dip"
-                android:orientation="horizontal"
-                android:gravity="center_vertical">
+                android:orientation="vertical">
 
-                <ImageView android:id="@+id/alarm_mute_button"
+                <TextView
+                        android:textAppearance="?android:attr/textAppearanceSmall"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:padding="16dip"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:contentDescription="@string/volume_alarm_mute" />
-                <SeekBar android:id="@+id/alarm_volume_seekbar"
-                        android:layout_width="0dip"
+                        android:layout_marginTop="16dip"
+                        android:paddingStart="16dip"
+                        android:layout_gravity="start"
+                        android:text="@string/volume_alarm_description"
+                    />
+
+                <!-- Used for the alarm volume -->
+                <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:paddingTop="2dip"
-                        android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
+                        android:paddingStart="8dip"
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical">
+
+                        <ImageView android:id="@+id/alarm_mute_button"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:padding="16dip"
+                                android:background="?android:attr/selectableItemBackground"
+                                android:contentDescription="@string/volume_alarm_mute" />
+                        <SeekBar android:id="@+id/alarm_volume_seekbar"
+                                android:layout_width="0dip"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:paddingTop="2dip"
+                                android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
+                </LinearLayout>
+
         </LinearLayout>
 
     </LinearLayout>
diff --git a/res/layout/preference_empty_list.xml b/res/layout/preference_empty_list.xml
index 1c721ac9c2c..9faffe3224c 100644
--- a/res/layout/preference_empty_list.xml
+++ b/res/layout/preference_empty_list.xml
@@ -24,7 +24,6 @@
         android:id="@+android:id/title"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="@*android:dimen/preference_fragment_padding_side"
         android:gravity="center" />
 
 </LinearLayout>
diff --git a/res/layout/preference_header_button_item.xml b/res/layout/preference_header_button_item.xml
new file mode 100644
index 00000000000..ecbd14b024d
--- /dev/null
+++ b/res/layout/preference_header_button_item.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Layout of a header item in PreferenceActivity. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:descendantFocusability="blocksDescendants"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="48dp"
+    android:background="?android:attr/activatedBackgroundIndicator"
+    android:gravity="center_vertical"
+    android:paddingEnd="?android:attr/scrollbarSize">
+
+    <LinearLayout
+        android:layout_width="@dimen/header_icon_width"
+        android:layout_marginStart="6dip"
+        android:layout_marginEnd="6dip"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1">
+
+        <TextView android:id="@+android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <TextView android:id="@+android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:ellipsize="end"
+            android:maxLines="2" />
+
+    </RelativeLayout>
+
+   <View
+       android:id="@+id/divider"
+       style="@style/VertDivider"
+       android:layout_marginTop="6dp"
+       android:layout_marginBottom="6dp" />
+
+   <ImageButton android:id="@+id/buttonWidget"
+       android:layout_width="wrap_content"
+       android:layout_height="wrap_content"
+       android:layout_gravity="center"
+       android:padding="8dip"
+       android:focusable="false"
+       style="?android:attr/borderlessButtonStyle"
+       android:clickable="true" />
+
+
+</LinearLayout>
diff --git a/res/layout/preference_home_app.xml b/res/layout/preference_home_app.xml
new file mode 100644
index 00000000000..841816171ef
--- /dev/null
+++ b/res/layout/preference_home_app.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingStart="@*android:dimen/preference_item_padding_side">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:id="@+id/home_app_pref"
+        android:focusable="true"
+        android:clickable="true"
+        android:gravity="center_vertical"
+        android:background="?android:attr/selectableItemBackground" >
+            <RadioButton
+                android:id="@+id/home_radio"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginStart="10dip"
+                android:layout_marginEnd="4dip"
+                android:layout_gravity="center_vertical"
+                android:orientation="vertical"
+                android:clickable="false"
+                android:focusable="false" />
+            <ImageView
+                android:id="@+android:id/icon"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="center"
+                android:minWidth="48dp"
+                android:scaleType="centerInside"
+                android:layout_marginEnd="@*android:dimen/preference_item_padding_inner"
+                />
+            <TextView
+                android:id="@+android:id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:layout_weight="1"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:ellipsize="end" />
+    </LinearLayout>
+    <View
+        android:id="@+id/home_divider"
+        android:layout_width="2dip"
+        android:layout_height="match_parent"
+        android:layout_marginTop="5dip"
+        android:layout_marginBottom="5dip"
+        android:background="@android:drawable/divider_horizontal_dark" />
+    <ImageView
+        android:id="@+id/home_app_uninstall"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:paddingStart="12dip"
+        android:paddingEnd="12dp"
+        android:src="@drawable/ic_menu_delete_holo_dark"
+        android:contentDescription="@string/home_app_uninstall_button"
+        android:layout_gravity="center"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?android:attr/selectableItemBackground" />
+</LinearLayout>
diff --git a/res/layout/preference_linearcolor.xml b/res/layout/preference_linearcolor.xml
new file mode 100644
index 00000000000..d3a2603f241
--- /dev/null
+++ b/res/layout/preference_linearcolor.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="?android:attr/listPreferredItemHeight"
+        android:paddingEnd="?android:attr/scrollbarSize">
+    <com.android.settings.applications.LinearColorBar
+        android:id="@+android:id/linear_color_bar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        android:gravity="center_vertical"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:shadowRadius="4"
+        android:shadowColor="?android:attr/colorBackground"
+        android:shadowDx="2"
+        android:shadowDy="2">
+    </com.android.settings.applications.LinearColorBar>
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/preference_widget_radiobutton.xml b/res/layout/preference_widget_radiobutton.xml
new file mode 100644
index 00000000000..7f4ee958eb7
--- /dev/null
+++ b/res/layout/preference_widget_radiobutton.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2006 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Layout used by CheckBoxPreference for the checkbox style. This is inflated
+     inside android.R.layout.preference. -->
+<RadioButton xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+android:id/checkbox"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:focusable="false"
+    android:clickable="false" />
diff --git a/res/layout/preference_widget_wifi_signal.xml b/res/layout/preference_widget_wifi_signal.xml
index 6df203c3abf..c2541a5f694 100644
--- a/res/layout/preference_widget_wifi_signal.xml
+++ b/res/layout/preference_widget_wifi_signal.xml
@@ -15,8 +15,8 @@
 -->
 
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/signal" 
+    android:id="@+id/signal"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:src="@drawable/wifi_signal"
+    android:src="?attr/wifi_signal"
     android:contentDescription="@null" />
diff --git a/res/layout/preset_picker_item.xml b/res/layout/preset_picker_item.xml
new file mode 100644
index 00000000000..0cafd347b65
--- /dev/null
+++ b/res/layout/preset_picker_item.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:paddingLeft="4dp"
+    android:paddingRight="4dp"
+    android:paddingTop="16dp" >
+
+    <FrameLayout
+        android:layout_width="96dp"
+        android:layout_height="96dp"
+        android:background="@drawable/transparency_tileable" >
+
+        <com.android.internal.widget.SubtitleView
+            android:id="@+id/preview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/captioning_preview_characters" />
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/summary"
+        android:layout_width="96dp"
+        android:layout_height="wrap_content"
+        android:gravity="center" />
+
+</LinearLayout>
diff --git a/res/layout/print_job_summary.xml b/res/layout/print_job_summary.xml
new file mode 100644
index 00000000000..d755de217fd
--- /dev/null
+++ b/res/layout/print_job_summary.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="15dip"
+    android:layout_marginEnd="6dip"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="top|start"
+    android:orientation="vertical"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:background="?android:attr/selectableItemBackground">
+
+    <View
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/listDivider">
+    </View>
+
+    <TextView android:id="@+android:id/summary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorSecondary">
+    </TextView>
+
+</LinearLayout>
diff --git a/res/layout/printer_dropdown_item.xml b/res/layout/printer_dropdown_item.xml
new file mode 100644
index 00000000000..ad393b8e5fc
--- /dev/null
+++ b/res/layout/printer_dropdown_item.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="48dip"
+    android:gravity="center_vertical"
+    android:paddingStart="@*android:dimen/preference_item_padding_side"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:background="?android:attr/selectableItemBackground">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="32dip"
+        android:layout_height="32dip"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="8dip"
+        android:duplicateParentState="true"
+        android:contentDescription="@null"
+        android:visibility="gone">
+    </ImageView>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:textIsSelectable="false">
+        </TextView>
+
+        <TextView
+            android:id="@+id/subtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:textIsSelectable="false"
+            android:visibility="gone"
+            android:textColor="?android:attr/textColorSecondary">
+        </TextView>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/process_stats_details.xml b/res/layout/process_stats_details.xml
new file mode 100644
index 00000000000..0de105418f8
--- /dev/null
+++ b/res/layout/process_stats_details.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipToPadding="false"
+    android:scrollbarStyle="@integer/preference_scrollbar_style">
+
+    <LinearLayout
+        android:id="@+id/all_details"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingTop="5dip"
+        android:paddingBottom="5dip"
+        android:orientation="vertical">
+
+        <include layout="@layout/app_percentage_item" />
+
+        <!-- Force stop and report buttons -->
+        <LinearLayout
+            android:id="@+id/two_buttons_panel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="6dip"
+            android:orientation="vertical">
+            <include
+                layout="@layout/two_buttons_panel"/>
+        </LinearLayout>
+
+        <TextView
+            style="?android:attr/listSeparatorTextViewStyle"
+            android:text="@string/details_subtitle" />
+
+        <LinearLayout
+            android:id="@+id/details"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="6dip"
+            android:orientation="vertical">
+
+            <!-- Insert detail items here -->
+
+        </LinearLayout>
+
+        <TextView
+            style="?android:attr/listSeparatorTextViewStyle"
+            android:text="@string/services_subtitle" />
+
+        <LinearLayout
+            android:id="@+id/services"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="6dip"
+            android:orientation="vertical">
+
+            <!-- Insert service items here -->
+
+        </LinearLayout>
+
+    </LinearLayout>
+</ScrollView>
diff --git a/res/layout/regulatory_info.xml b/res/layout/regulatory_info.xml
index 478eaab09e7..8cd41571098 100755
--- a/res/layout/regulatory_info.xml
+++ b/res/layout/regulatory_info.xml
@@ -17,6 +17,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <ImageView
+        android:id="@+id/regulatoryInfo"
         android:adjustViewBounds="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/res/layout/running_processes_view.xml b/res/layout/running_processes_view.xml
index b5fb8101e69..3a2552ffeef 100644
--- a/res/layout/running_processes_view.xml
+++ b/res/layout/running_processes_view.xml
@@ -24,10 +24,9 @@
             android:layout_height="0px"
             android:layout_weight="1">
         <ListView android:id="@android:id/list"
+                style="@style/PreferenceFragmentListSinglePane"
                 android:layout_width="match_parent" 
                 android:layout_height="match_parent"
-                android:paddingStart="@*android:dimen/preference_fragment_padding_side"
-                android:paddingEnd="@*android:dimen/preference_fragment_padding_side"
                 android:drawSelectorOnTop="false"
                 android:scrollbarStyle="outsideOverlay"
                 android:fastScrollEnabled="true" />
@@ -38,8 +37,14 @@
                 android:text="@string/no_running_services"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
     </FrameLayout>
+    <!-- Force layout direction to LTR for now as we want the text to be at the same position in
+         any Locale included the RTL ones. Will need to fix LinearColorBar RTL support later.
+         Please also note the left/right gravities that would also need to be changed for proper
+         RTL support -->
     <view class="com.android.settings.applications.LinearColorBar"
             android:id="@+id/color_bar"
+            android:layout_marginStart="@dimen/settings_side_margin"
+            android:layout_marginEnd="@dimen/settings_side_margin"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="-5dp"
@@ -50,14 +55,13 @@
             android:paddingStart="4dp"
             android:paddingEnd="4dp"
             android:paddingBottom="1dp"
-            android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
-            android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side">
+            android:layoutDirection="ltr">
         <TextView android:id="@+id/foregroundText"
             android:layout_width="0px"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:focusable="true"
-            android:gravity="start|bottom"
+            android:gravity="left|bottom"
             android:textAppearance="?android:attr/textAppearanceSmallInverse"
             android:textColor="#000"
             android:singleLine="true" />
@@ -79,7 +83,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:focusable="true"
-            android:gravity="end|bottom"
+            android:gravity="right|bottom"
             android:textAppearance="?android:attr/textAppearanceSmallInverse"
             android:textColor="#000"
             android:singleLine="true" />
diff --git a/res/layout/running_service_details.xml b/res/layout/running_service_details.xml
index 92ce07be9f7..f618bddb65d 100644
--- a/res/layout/running_service_details.xml
+++ b/res/layout/running_service_details.xml
@@ -21,7 +21,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
-    android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle">
+    android:scrollbarStyle="@integer/preference_scrollbar_style">
 
     <LinearLayout
         android:id="@+id/all_details"
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index 7e917d88587..d0cbc02d6a6 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -33,7 +33,6 @@
             android:id="@+id/title_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/title"
             android:gravity="bottom"
             android:orientation="horizontal">
             <TextView
@@ -52,7 +51,7 @@
                 android:layout_marginStart="8dip"
                 android:layout_marginEnd="8dip"
                 android:layout_marginBottom="8dip"
-                android:src="@*android:drawable/ic_menu_moreoverflow_holo_dark"
+                android:src="?attr/ic_menu_moreoverflow"
                 android:background="?android:attr/actionBarItemBackground"
                 android:contentDescription="@string/wifi_menu_more_options" />
 
@@ -124,7 +123,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:src="@drawable/ic_menu_add" />
+                android:src="?attr/ic_menu_add" />
 
             <TextView
                 android:id="@+id/other"
diff --git a/res/layout/sms_preference_item.xml b/res/layout/sms_preference_item.xml
new file mode 100755
index 00000000000..21467640af9
--- /dev/null
+++ b/res/layout/sms_preference_item.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:padding="6dip">
+    <ImageView
+        android:id="@+id/sms_image"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:padding="6dip"
+    />
+    <CheckedTextView
+        android:id="@+id/sms_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textColor="?android:attr/textColorAlertDialogListItem"
+        android:gravity="center_vertical"
+        android:paddingEnd="7dip"
+        android:checkMark="?android:attr/listChoiceIndicatorSingle"
+        android:ellipsize="marquee"
+    />
+</LinearLayout>
diff --git a/res/layout/title.xml b/res/layout/title.xml
index 46b21150cc6..63030affd06 100644
--- a/res/layout/title.xml
+++ b/res/layout/title.xml
@@ -23,8 +23,8 @@
     android:id="@+id/title_area"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
-    android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side"
+    android:layout_marginStart="@dimen/settings_side_margin"
+    android:layout_marginEnd="@dimen/settings_side_margin"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
diff --git a/res/layout/user_dictionary_add_word_fullscreen.xml b/res/layout/user_dictionary_add_word_fullscreen.xml
index b72886f459b..42bd197f41b 100644
--- a/res/layout/user_dictionary_add_word_fullscreen.xml
+++ b/res/layout/user_dictionary_add_word_fullscreen.xml
@@ -14,63 +14,54 @@
      limitations under the License.
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:id="@+id/user_dict_settings_add_dialog_top"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="vertical">
+    android:id="@+id/user_dict_settings_add_dialog_top"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
 
-  <TextView
-     android:layout_height="wrap_content"
-     android:layout_width="match_parent"
-     android:text="@string/user_dict_settings_add_screen_title"
-     style="?android:attr/listSeparatorTextViewStyle" />
+    <EditText
+        android:id="@+id/user_dictionary_add_word_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="fill_horizontal|center_vertical"
+        android:layout_marginBottom="8dip"
+        android:layout_marginStart="8dip"
+        android:layout_marginTop="8dip"
+        android:hint="@string/user_dict_settings_add_word_hint"
+        android:imeOptions="flagNoFullscreen"
+        android:inputType="textNoSuggestions"
+        android:maxLength="@integer/maximum_user_dictionary_word_length" >
 
-  <EditText android:id="@+id/user_dictionary_add_word_text"
-            android:maxLength="@integer/maximum_user_dictionary_word_length"
+        <requestFocus />
+    </EditText>
+
+    <GridLayout
+        android:id="@+id/user_dictionary_add_word_grid"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dip"
+        android:layout_marginStart="8dip"
+        android:columnCount="2" >
+
+        <TextView
+            android:id="@+id/user_dictionary_add_shortcut_label"
+            style="?android:attr/textAppearanceSmall"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_width="match_parent"
+            android:layout_gravity="start|center_vertical"
+            android:text="@string/user_dict_settings_add_shortcut_option_name" />
+
+        <EditText
+            android:id="@+id/user_dictionary_add_shortcut"
+            android:layout_width="wrap_content"
             android:layout_gravity="fill_horizontal|center_vertical"
-            android:layout_marginStart="8dip"
             android:layout_marginBottom="8dip"
+            android:layout_marginStart="8dip"
             android:layout_marginTop="8dip"
-            android:hint="@string/user_dict_settings_add_word_hint"
+            android:hint="@string/user_dict_settings_add_shortcut_hint"
+            android:imeOptions="flagNoFullscreen"
             android:inputType="textNoSuggestions"
-            android:imeOptions="flagNoFullscreen">
-    <requestFocus />
-  </EditText>
-  <GridLayout android:id="@+id/user_dictionary_add_word_grid"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:layout_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="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_marginStart="8dip"
-              android:layout_marginBottom="8dip"
-              android:layout_marginTop="8dip"
-              android:hint="@string/user_dict_settings_add_shortcut_hint"
-              android:inputType="textNoSuggestions"
-              android:imeOptions="flagNoFullscreen" />
-    <TextView android:id="@+id/user_dictionary_add_locale_label"
-              style="?android:attr/textAppearanceSmall"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              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_marginStart="8dip"
-              android:layout_marginBottom="8dip"
-              android:layout_marginTop="8dip"
-              android:layout_width="wrap_content"
-              android:layout_gravity="fill_horizontal|center_vertical" />
+            android:maxLength="@integer/maximum_user_dictionary_word_length" />
     </GridLayout>
+
 </LinearLayout>
diff --git a/res/layout/user_info_header.xml b/res/layout/user_info_header.xml
index c698eaf5e3a..aeecc58eb9d 100644
--- a/res/layout/user_info_header.xml
+++ b/res/layout/user_info_header.xml
@@ -22,8 +22,8 @@
     android:orientation="vertical"
     android:focusable="true"
     android:clickable="true"
-    android:paddingStart="@*android:dimen/preference_fragment_padding_side"
-    android:paddingEnd="@*android:dimen/preference_fragment_padding_side" >
+    android:paddingStart="@dimen/settings_side_margin"
+    android:paddingEnd="@dimen/settings_side_margin" >
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/res/layout/widget.xml b/res/layout/widget.xml
index d000a463d4b..a125d80dbe5 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -95,7 +95,7 @@
         />
 
     <LinearLayout
-        android:id="@+id/btn_gps"
+        android:id="@+id/btn_location"
         android:layout_width="0dip"
         android:layout_weight="1"
         android:layout_height="match_parent"
@@ -106,7 +106,7 @@
         android:orientation="vertical">
 
         <ImageView
-            android:id="@+id/img_gps"
+            android:id="@+id/img_location"
             android:layout_width="match_parent"
             android:layout_height="0dip"
             android:layout_weight="1"
@@ -115,7 +115,7 @@
             />
 
         <ImageView
-            android:id="@+id/ind_gps"
+            android:id="@+id/ind_location"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scaleType="fitXY"
diff --git a/res/layout/wifi_ap_dialog.xml b/res/layout/wifi_ap_dialog.xml
index a2146c62224..002a6403a89 100644
--- a/res/layout/wifi_ap_dialog.xml
+++ b/res/layout/wifi_ap_dialog.xml
@@ -82,7 +82,8 @@
                     android:layout_height="wrap_content"
                     android:singleLine="true"
                     android:password="true"
-                    android:maxLength="63" />
+                    android:maxLength="63"
+                    android:imeOptions="flagForceAscii" />
 
             <TextView android:id="@+id/hint"
                     style="?android:attr/textAppearanceSmall"
diff --git a/res/layout/wifi_wps_dialog.xml b/res/layout/wifi_wps_dialog.xml
index 1c5713a915e..a86823d66fa 100644
--- a/res/layout/wifi_wps_dialog.xml
+++ b/res/layout/wifi_wps_dialog.xml
@@ -35,7 +35,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="8dip"
-                android:src="@drawable/ic_wps" />
+                android:src="?attr/ic_wps" />
 
         <ProgressBar
                 android:id="@+id/wps_timeout_bar"
diff --git a/res/menu/print_service_settings.xml b/res/menu/print_service_settings.xml
new file mode 100644
index 00000000000..a9a4aeda23d
--- /dev/null
+++ b/res/menu/print_service_settings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/print_menu_item_search"
+        android:title="@string/print_menu_item_search"
+        android:icon="@*android:drawable/ic_menu_search_holo_dark"
+        android:actionViewClass="android.widget.SearchView"
+        android:showAsAction="ifRoom|collapseActionView"
+        android:imeOptions="actionSearch">
+    </item>
+    <item
+        android:id="@+id/print_menu_item_add_printer"
+        android:title="@string/print_menu_item_add_printer"
+        android:showAsAction="never">
+    </item>
+    <item
+        android:id="@+id/print_menu_item_settings"
+        android:title="@string/print_menu_item_settings"
+        android:showAsAction="never">
+    </item>
+</menu>
diff --git a/res/menu/vpn.xml b/res/menu/vpn.xml
index dd8f64cbe0c..3e0a7880464 100644
--- a/res/menu/vpn.xml
+++ b/res/menu/vpn.xml
@@ -18,7 +18,7 @@
     <item
         android:id="@+id/vpn_create"
         android:title="@string/vpn_create"
-        android:icon="@drawable/ic_menu_add"
+        android:icon="?attr/ic_menu_add"
         android:showAsAction="always" />
     <item
         android:id="@+id/vpn_lockdown"
diff --git a/res/mipmap-hdpi/ic_launcher_settings.png b/res/mipmap-hdpi/ic_launcher_settings.png
index 32da776f3ec..a8ccc893812 100644
Binary files a/res/mipmap-hdpi/ic_launcher_settings.png and b/res/mipmap-hdpi/ic_launcher_settings.png differ
diff --git a/res/mipmap-mdpi/ic_launcher_settings.png b/res/mipmap-mdpi/ic_launcher_settings.png
index 32a22ac93bf..69709a8b4ed 100644
Binary files a/res/mipmap-mdpi/ic_launcher_settings.png and b/res/mipmap-mdpi/ic_launcher_settings.png differ
diff --git a/res/mipmap-xhdpi/ic_launcher_settings.png b/res/mipmap-xhdpi/ic_launcher_settings.png
index 9bfdd784931..c3adce611a1 100644
Binary files a/res/mipmap-xhdpi/ic_launcher_settings.png and b/res/mipmap-xhdpi/ic_launcher_settings.png differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_settings.png b/res/mipmap-xxhdpi/ic_launcher_settings.png
index 489ed6adbc5..52fe9785598 100644
Binary files a/res/mipmap-xxhdpi/ic_launcher_settings.png and b/res/mipmap-xxhdpi/ic_launcher_settings.png differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_settings.png b/res/mipmap-xxxhdpi/ic_launcher_settings.png
new file mode 100644
index 00000000000..6b92795d421
Binary files /dev/null and b/res/mipmap-xxxhdpi/ic_launcher_settings.png differ
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index d688c58e490..07094a42a60 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Ligging"</item>
     <item msgid="255608127647030286">"Persoonlik"</item>
     <item msgid="4588829735729884491">"Boodskappe"</item>
-    <item msgid="8971765125227378270">"Toestel"</item>
+    <item msgid="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Toestel"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"growwe ligging"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"speel oudio"</item>
     <item msgid="8374996688066472414">"lees knipbord"</item>
     <item msgid="3045529469061083747">"verander knipbord"</item>
+    <item msgid="5124443975763747838">"mediaknoppies"</item>
+    <item msgid="4547883971364273343">"klankfokus"</item>
+    <item msgid="2603878814882344450">"meestervolume"</item>
+    <item msgid="7136963238377062018">"stemvolume"</item>
+    <item msgid="4270236897655923007">"lui-volume"</item>
+    <item msgid="6325739889222559394">"mediavolume"</item>
+    <item msgid="5762123934816216821">"wekkervolume"</item>
+    <item msgid="785049718065337473">"kennisgewingvolume"</item>
+    <item msgid="6700305533746877052">"bluetoothvolume"</item>
+    <item msgid="2029227495214047094">"hou wakker"</item>
+    <item msgid="26109888160231211">"monitor ligging"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Ligging"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Speel oudio"</item>
     <item msgid="136815868796597058">"Lees knipbord"</item>
     <item msgid="5238692940326972503">"Verander knipbord"</item>
+    <item msgid="5753789168376302997">"Mediaknoppies"</item>
+    <item msgid="3265262911688671938">"Oudiofokus"</item>
+    <item msgid="2098976479485046797">"Meestervolume"</item>
+    <item msgid="5660213838861789350">"Stemvolume"</item>
+    <item msgid="7983336752371254444">"Luivolume"</item>
+    <item msgid="7878027809189330917">"Mediavolume"</item>
+    <item msgid="7260546305036218513">"Wekkervolume"</item>
+    <item msgid="9103719301075748925">"Kennisgewingvolume"</item>
+    <item msgid="7025966722295861512">"Bluetoothvolume"</item>
+    <item msgid="4665183401128289653">"Hou wakker"</item>
+    <item msgid="8584357129746649222">"Ligging"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Medium"</item>
     <item msgid="2372711992605524591">"Lank"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (ontfout)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Gebruik Dalvik"</item>
+    <item msgid="5131846588686178907">"Gebruik ART"</item>
+    <item msgid="4530003713865319928">"Gebruik ART-ontfoutbou"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Kontroleer nooit"</item>
     <item msgid="6042769699089883931">"Kontroleer net vir DRM-inhoud"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Op skerm as reëls"</item>
     <item msgid="120512413928262547">"In adb-dop dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Af"</item>
+    <item msgid="7688197031296835369">"Wys oortrekareas"</item>
+    <item msgid="8332661909019981149">"Wys oortrektoonbank"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standaardlimiet"</item>
     <item msgid="4071574792028999443">"Geen agtergrondprosesse"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 4c0c3d713fd..9b75efc09c3 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"As jy dataswerwing toelaat, kan hoë swerwingskoste jou in die gesig staar! \n\nHierdie instelling beïnvloed alle gebruikers op hierdie tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"As jy dataswerwing toelaat, kan hoë swerwingskoste jou in die gesig staar! \n\nHierdie instelling beïnvloed alle gebruikers op hierdie foon."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Laat dataswerwing toe?"</string>
     <string name="networks" msgid="6333316876545927039">"Operateurkeuse"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Kies \'n netwerkoperateur"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Vereis \'n numeriese PIN of wagwoord om jou tablet te dekripteer elke keer as jy dit aanskakel"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Vereis \'n numeriese PIN of wagwoord om jou foon te dekripteer elke keer as jy dit aanskakel"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Geënkripteer"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media, en ander lêers enkripteer. Sodra jy jou tablet geënkripteer het, moet jy elke keer \'n numeriese PIN of wagwoord invoer om dit te dekripteer wanneer jy dit aanskakel. Jy kan nie jou tablet dekripteer nie, behalwe deur \'n fabrieksterugstelling uit te voer, wat al jou data sal uitvee."\n\n"Enkripsie neem \'n uur of langer. Jy moet begin met \'n volgelaaide battery en jou tablet ingeprop hou tot enkripsie klaar is. As jy die enkripsieproses onderbreek, sal jy sommige van of al jou data verloor."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media, en ander lêers enkripteer. Sodra jy jou foon geënkripteer het, moet jy elke keer \'n numeriese PIN of wagwoord invoer om dit te dekripteer wanneer jy dit aanskakel. Jy kan nie jou foon dekripteer nie, behalwe deur \'n fabrieksterugstelling uit te voer, wat al jou data sal uitvee."\n\n"Enkripsie neem \'n uur of langer. Jy moet begin met \'n volgelaaide battery en jou foon ingeprop hou tot enkripsie klaar is. As jy die enkripsieproses onderbreek, sal jy sommige van of al jou data verloor."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media, en ander lêers enkripteer. Sodra jy jou tablet geënkripteer het, moet jy elke keer \'n numeriese PIN of wagwoord invoer om dit te dekripteer wanneer jy dit aanskakel. Jy kan nie jou tablet dekripteer nie, behalwe deur \'n fabrieksterugstelling uit te voer, wat al jou data sal uitvee.\n\nEnkripsie neem \'n uur of langer. Jy moet begin met \'n volgelaaide battery en jou tablet ingeprop hou tot enkripsie klaar is. As jy die enkripsieproses onderbreek, sal jy sommige van of al jou data verloor."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media, en ander lêers enkripteer. Sodra jy jou foon geënkripteer het, moet jy elke keer \'n numeriese PIN of wagwoord invoer om dit te dekripteer wanneer jy dit aanskakel. Jy kan nie jou foon dekripteer nie, behalwe deur \'n fabrieksterugstelling uit te voer, wat al jou data sal uitvee.\n\nEnkripsie neem \'n uur of langer. Jy moet begin met \'n volgelaaide battery en jou foon ingeprop hou tot enkripsie klaar is. As jy die enkripsieproses onderbreek, sal jy sommige van of al jou data verloor."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Enkripteer tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Enkripteer foon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laai jou battery en probeer weer."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Probeer weer oor <xliff:g id="DELAY">^1</xliff:g> sekondes."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Voer jou wagwoord in"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripsie onsuksesvol"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Enkripsie is onderbreek en kan nie voltooi word nie. Gevolglik is die data op jou tablet nie langer toeganklik nie. "\n\n" Om gebruik van jou tablet te hervat, moet jy \'n fabriekterugstelling doen. As jy jou tablet opstel na die terugstelling, sal jy \'n geleentheid kry om enige inligting te herstel wat na jou Google-rekening gerugsteun was."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Enkripsie is onderbreek en kan nie voltooi word nie. Gevolglik is die data op jou selfoon nie langer toeganklik nie. "\n\n"Om gebruik van jou selfoon te hervat, moet jy \'n fabriekterugstelling doen. As jy jou foon na die terugstelling weer opstel, sal jy \'n geleentheid kry om enige inligting te herstel wat na jou Google-rekening gerugsteun was."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Enkripsie is onderbreek en kan nie voltooi word nie. Gevolglik is die data op jou tablet nie langer toeganklik nie. \n\n Om gebruik van jou tablet te hervat, moet jy \'n fabriekterugstelling doen. As jy jou tablet opstel na die terugstelling, sal jy \'n geleentheid kry om enige inligting te herstel wat na jou Google-rekening gerugsteun was."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Enkripsie is onderbreek en kan nie voltooi word nie. Gevolglik is die data op jou selfoon nie langer toeganklik nie. \n\nOm gebruik van jou selfoon te hervat, moet jy \'n fabriekterugstelling doen. As jy jou foon na die terugstelling weer opstel, sal jy \'n geleentheid kry om enige inligting te herstel wat na jou Google-rekening gerugsteun was."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Wissel invoermetode"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Kies skermslot"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Kies rugsteunslot"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Koppel tans"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Gekoppel"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Beskikbaar"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"In gebruik"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Vertooninstellings"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Ontkoppel?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Dit sal jou verbinding met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; beëindig."</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Af"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Onbeskikbaar omdat NFC afgeskakel is"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Wanneer hierdie funksie aangeskakel is, kan jy programinhoud na \'n ander NFC-toestel oorsein deur die toestelle naby aan mekaar te hou. Jy kan byvoorbeeld blaaierbladsye, YouTube-video\'s, Mense-kontakte en meer oorsein. "\n" "\n"Bring bloot die toestelle bymekaar (gewoonlik rug teen rug) en raak dan aan jou skerm. Die program bepaal wat oorgesein word."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Wanneer hierdie funksie aangeskakel is, kan jy programinhoud na \'n ander NFC-toestel oorsein deur die toestelle naby aan mekaar te hou. Jy kan byvoorbeeld blaaierbladsye, YouTube-video\'s, Mense-kontakte en meer oorsein. \n \nBring bloot die toestelle bymekaar (gewoonlik rug teen rug) en raak dan aan jou skerm. Die program bepaal wat oorgesein word."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Netwerkdiens-ontdekking"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Laat programme op ander toestelle toe om programme op hierdie toestel te ontdek"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Beveilig met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", beveilig met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Geen"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Om liggingsakkuraatheid te verbeter en vir ander doele, wil <xliff:g id="APP_NAME">%1$s</xliff:g> netwerkskandering aanskakel, selfs wanneer Wi-Fi af is."\n\n" Laat dit toe vir alle programme wat wil skandeer?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Om liggingsakkuraatheid te verbeter en vir ander doele, wil <xliff:g id="APP_NAME">%1$s</xliff:g> netwerkskandering aanskakel, selfs wanneer Wi-Fi af is.\n\n Laat dit toe vir alle programme wat wil skandeer?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Laat toe"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Weier"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Koppel"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"LET WEL: Jy kan moontlik ekstra diensverskaffer-datakoste aangaan.\n\nTablet-opstelling kan beduidende netwerkaktiwiteit vereis."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"LET WEL: Jy kan moontlik ekstra diensverskaffer-datakoste aangaan.\n\nFoon-opstelling kan beduidende netwerkaktiwiteit vereis."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"LET WEL: Die tablet sal nie kan verifieer of jou sagteware op datum is totdat jy \'n internetverbinding het nie."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"LET WEL: Die foon sal nie kan verifieer of jou sagteware op datum is todat jy \'n internetverbinding het nie."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Die tablet kon nie aan hierdie Wi-Fi-netwerk koppel nie."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Verkeerde PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN\'e stem nie ooreen nie"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Kan nie PIN verander nie."\n"Moontlik verkeerde PIN."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Kan nie PIN verander nie.\nMoontlik verkeerde PIN."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-PIN is suksesvol verander"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Kan nie SIM-kaart se sluitstatus verander nie."\n"Moontlik \'n verkeerde PIN."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Kan nie SIM-kaart se sluitstatus verander nie.\nMoontlik \'n verkeerde PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Kanselleer"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tabletstatus"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrieksterugstelling"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Vee alle data op tablet uit"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Vee al die data op foon uit"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Dit sal al die data uit jou tablet se "<b>"interne geheue"</b>" uitvee, insluitend: "\n\n<li>"jou Google-rekening"</li>\n" "<li>"stelsel- en programdata-instellings"</li>\n<li>"afgelaaide programme"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Dit sal al die data uit jou tablet se "<b>"interne geheue"</b>" uitvee, insluitend: "\n\n<li>"jou Google-rekening"</li>\n" "<li>"stelsel- en programdata-instellings"</li>\n<li>"afgelaaide programme"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jy is tans aangemeld by die volgende rekeninge:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Dit sal al die data uit jou tablet se "<b>"interne geheue"</b>" uitvee, insluitend: \n\n"<li>"jou Google-rekening"</li>\n" "<li>"stelsel- en programdata-instellings"</li>\n<li>"afgelaaide programme"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Dit sal al die data uit jou tablet se "<b>"interne geheue"</b>" uitvee, insluitend: \n\n"<li>"jou Google-rekening"</li>\n" "<li>"stelsel- en programdata-instellings"</li>\n<li>"afgelaaide programme"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jy is tans aangemeld by die volgende rekeninge:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiek"</li>\n<li>"Foto\'s"</li>\n<li>"Ander gebruikerdata"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Om musiek, prente en ander gebruikersdata uit te vee, moet die "<b>"USB-berging"</b>" uitgevee word."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Om musiek, prente en ander gebruikersdata uit te vee, moet die "<b>"SD-kaart"</b>" uitgevee word."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Wys gekaste prosesse"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Stel programvoorkeure terug"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Stel programvoorkeure terug?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Dit sal alle voorkeure terugstel vir:"\n\n<li>"Gedeaktiveerde programme"</li>\n" "<li>"Gedeaktiveerde programkennisgewings"</li>\n" "<li>"Verstek programme vir aksies"</li>\n" "<li>"Agtergronddata-beperkings vir programme"</li>\n" "\n" Jy sal nie enige programdata verloor nie."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Dit sal alle voorkeure terugstel vir:\n\n"<li>"Gedeaktiveerde programme"</li>\n" "<li>"Gedeaktiveerde programkennisgewings"</li>\n" "<li>"Verstek programme vir aksies"</li>\n" "<li>"Agtergronddata-beperkings vir programme"</li>\n" \n Jy sal nie enige programdata verloor nie."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Stel programme terug"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Bestuur spasie"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Om te wissel, druk Control-spasiebalk"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Verstek"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Sleutelborduitlegte"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Gebruikerwoordeboek"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Persoonlike woordeboek"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Persoonlike woordeboeke"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Persoonlike woordeboek"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Voeg by"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Voeg by woordeboek"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Sluit opsie in die kragkieslys in vir die neem van \'n foutverslag"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Bly wakker"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skerm sal nooit slaap terwyl laai nie"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktiveer Bluetooth HCI-loerloglêer"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Vang alle Bluetooth HCI-pakette in \'n lêer vas"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Kies looptyd"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Kies looptyd"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Herlaai om looptyd van <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g> te verander?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Laat skynliggings toe"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Laat skynliggings toe"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Laat USB-ontfouting toe?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Beskerm USB-berging"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Programme moet toestemming versoek om USB-berging te lees"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Beskerm USB-berging?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Wanneer USB-geheue beskerm word, moet programme toestemming versoek om data vanuit eksterne berging te lees."\n\n" Sommige programme werk dalk nie totdat dit deur hul ontwikkelaars opgedateer word.berging"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Wanneer USB-geheue beskerm word, moet programme toestemming versoek om data vanuit eksterne berging te lees.\n\n Sommige programme werk dalk nie totdat dit deur hul ontwikkelaars opgedateer word.berging"</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Beskerm SD-kaart"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Programme moet toestemming versoek om SD-kaart te lees"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Beskerm SD-kaart?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wanneer die SD-kaart beskerm word, moet programme toestemming versoek om data vanuit eksterne berging te lees."\n\n"Sommige programme werk dalk nie totdat dit deur hul ontwikkelaars opgedateer word."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wanneer die SD-kaart beskerm word, moet programme toestemming versoek om data vanuit eksterne berging te lees.\n\nSommige programme werk dalk nie totdat dit deur hul ontwikkelaars opgedateer word."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Plaaslike terminaal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Aktiveer terminaalprogram wat plaaslike skermtoegang bied"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Kies apparaat"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Kies legstuk"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Skep legstuk en laat toegang toe?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Dienste"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Stelsel"</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_screen_magnification_summary" msgid="2380627654189671754">"Wanneer hierdie funksie aangeskakel is, kan jy in- en uitzoem deur die skerm te trippeltik.\n \nTerwyl jy ingezoem is, kan jy:\n"<ul><li>"Swenk: Sleep twee of meer vingers oor die skerm."</li>\n<li>"Verstel zoemvlak: Knyp twee of meer vingers saam of versprei hulle uitmekaar."</li></ul>\n\n"Jy kan ook dit wat onder jou vinger is tydelik vergroot deur die skerm te trippeltik-en-hou. In daardie vergroting kan jy jou vinger sleep om verskillende dele van die skerm te verken. Lig jou vinger om terug te keer na die vorige vergroting.\n\nLet wel: trippeltik vir vergroting werk oral behalwe op die sleutelbord en navigasiebalk."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Toeganklikheid-kortpad"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Aan"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Af"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Wanneer hierdie kenmerk aangeskakel is, kan jy toeganklikheidskenmerke vinnig met twee stappe aktiveer:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Wanneer hierdie kenmerk aangeskakel is, kan jy toeganklikheidskenmerke vinnig met twee stappe aktiveer:\n\nStap 1: Druk en hou die kragknoppie totdat jy \'n geluid hoor of \'n vibrasie voel.\n\nStap 2: Raak en hou met twee vingers totdat jy oudiobevestiging hoor.\n\nAs die toestel verskeie gebruikers het, sal hierdie kortpad op die sluitskerm tydelik toegang bied totdat die toestel ontsluit is."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Groot teks"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Skermvergroting"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Dateer outomaties skermvergroting op"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack bied gesproke terugvoer om blindes en gebruikers met swak sig te help. Wil jy dit gratis vanaf Android Market installeer?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Geen beskrywing verskaf nie."</string>
     <string name="settings_button" msgid="3006713718908152930">"Instellings"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Druk"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Druk-instellings"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Dienste"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Gebruik <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> kan dokumente ontvang wat jy druk. Sulke dokumente kan sensitiewe inligting bevat."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Geen dienste geïnstalleer nie"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Instellings"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Voeg drukkers by"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Aan"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Af"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Battery"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Wat het die battery gebruik"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Batterygebruikdata is nie beskikbaar nie."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi aan"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Foon"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Data gestuur"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Data ontvang"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Mobiele data gestuur"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Mobiele data ontvang"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Wi‑Fi-data gestuur"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Wi‑Fi-data ontvang"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Oudio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tyd aan"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Toonhoogte"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Affekteer die klank van die gesproke teks"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Taal"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Taal nie gekies nie"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Stel die taalspesifieke stem vir gesproke teks"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Luister na \'n voorbeeld"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Speel \'n kort demonstrasie van spraaksintese"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP word nie ondersteun nie"</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Jy kan nie \'n EAP-Wi-Fi-verbinding tydens opstelling konfigureer nie. Na opstelling kan jy dit doen in Instellings, onder Wi-Fi en netwerke."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Verbinding kan \'n paar minute neem..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Raak "<b>"Volgende"</b>" om voort te gaan met opstelling."\n\n"Raak "<b>"Terug"</b>" om aan \'n ander Wi‑Fi-netwerk te koppel."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Raak "<b>"Volgende"</b>" om voort te gaan met opstelling.\n\nRaak "<b>"Terug"</b>" om aan \'n ander Wi‑Fi-netwerk te koppel."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinkronisasie geaktiveer"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinkronisasie gedeaktiveer"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Sinkroniseerfout."</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalender"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kontakte"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welkom by Google Sync!"</font>" "\n"\'n Google-benadering om data te sinchroniseer vir toegang tot al jou kontakte, afsprake en meer, ongeag waar jy is."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welkom by Google Sync!"</font>" \n\'n Google-benadering om data te sinchroniseer vir toegang tot al jou kontakte, afsprake en meer, ongeag waar jy is."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Programsinkronisering-instellings"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data en sinkronisering"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Verander wagwoord"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Ontfout GPU-oortrek"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Deaktiveer HW-oorleggers"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Gebruik altyd GPU vir skermsamestelling"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktiveer OpenGL-spore"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Deaktiveer agtergronddata op mobiele netwerke. Niesellulêre netwerke sal gebruik word, indien beskikbaar."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Om agtergronddata vir hierdie program te beperk, moet jy eers \'n mobieldatalimiet stel."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Beperk agtergronddata?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Hierdie funksie kan veroorsaak dat \'n program wat afhanklik is van agtergronddata, ophou werk wanneer slegs mobiele netwerke beskikbaar is."\n\n"Jy kan meer geskikte datagebruik-kontroles vind in die instellings wat in die program self beskikbaar is."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Hierdie funksie kan veroorsaak dat \'n program wat afhanklik is van agtergronddata, ophou werk wanneer slegs mobiele netwerke beskikbaar is.\n\nJy kan meer geskikte datagebruik-kontroles vind in die instellings wat in die program self beskikbaar is."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Beperking van agtergronddata is moontlik slegs as jy \'n mobieldatalimiet gestel het."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Moet die outomatiese sinkronisering van data aangeskakel word?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Enige veranderings wat jy aan jou rekeninge op die web maak, sal outomaties na jou tablet gekopieer word."\n\n"Sommige rekeninge kan ook moontlik outomaties enige veranderinge wat jy op die tablet maak, na die web kopieer. \'n Google-rekening werk so."\n\n"Om te kies watter soort inligting binne elke rekening gesinkroniseer moet word, gaan na Instellings en Rekeninge."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Enige veranderings wat jy aan jou rekeninge op die web maak, sal outomaties na jou foon gekopieer word."\n\n"Sommige rekeninge kan ook moontlik outomaties enige veranderinge wat jy op die foon maak, na die web kopieer. \'n Google-rekening werk so."\n\n"Om te kies watter soort inligting binne elke rekening gesinkroniseer moet word, gaan na Instellings en Rekeninge."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Enige veranderings wat jy aan jou rekeninge op die web maak, sal outomaties na jou tablet gekopieer word.\n\nSommige rekeninge kan ook moontlik outomaties enige veranderinge wat jy op die tablet maak, na die web kopieer. \'n Google-rekening werk so.\n\nOm te kies watter soort inligting binne elke rekening gesinkroniseer moet word, gaan na Instellings en Rekeninge."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Enige veranderings wat jy aan jou rekeninge op die web maak, sal outomaties na jou foon gekopieer word.\n\nSommige rekeninge kan ook moontlik outomaties enige veranderinge wat jy op die foon maak, na die web kopieer. \'n Google-rekening werk so.\n\nOm te kies watter soort inligting binne elke rekening gesinkroniseer moet word, gaan na Instellings en Rekeninge."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Moet die outomatiese sinkronisering van data afgeskakel word?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Dit sal data- en batteryverbruik bespaar, maar jy sal elke rekening self moet sinkroniseer om onlangse inligting in te samel.  En jy sal geen kennisgewings ontvang wanneer opdaterings plaasvind nie."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Gebruiksiklus-terugsteldatum"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Stel dataverbruik-waarskuwing"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Stel dataverbruik-limiet"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Beperk datagebruik"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Jou mobiele dataverbinding sal gedeaktiveer word wanneer die gespesifiseerde limiet bereik word."\n\n"Aangesien die datagebruik deur jou tablet gemeet word en jou diensverskaffer dit dalk anders bereken, oorweeg dit maar om \'n konserwatiewe limiet te gebruik."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Jou mobiele dataverbinding sal gedeaktiveer word wanneer die gespesifiseerde limiet bereik word."\n\n"Aangesien datagebruik deur jou foon gemeet word en jou diensverskaffer gebruik dalk anders bereken, oorweeg dit maar om \'n konserwatiewe limiet te gebruik."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Jou mobiele dataverbinding sal gedeaktiveer word wanneer die gespesifiseerde limiet bereik word.\n\nAangesien die datagebruik deur jou tablet gemeet word en jou diensverskaffer dit dalk anders bereken, oorweeg dit maar om \'n konserwatiewe limiet te gebruik."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Jou mobiele dataverbinding sal gedeaktiveer word wanneer die gespesifiseerde limiet bereik word.\n\nAangesien datagebruik deur jou foon gemeet word en jou diensverskaffer gebruik dalk anders bereken, oorweeg dit maar om \'n konserwatiewe limiet te gebruik."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Beperk agtergronddata?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"As jy mobiele data in die agtergrond beperk, sal sommige programme en dienste nie werk tensy jy aan \'n Wi-Fi-netwerk gekoppel is nie."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"As jy mobiele data in die agtergrond beperk, sal sommige programme en dienste nie werk tensy jy aan \'n Wi-Fi-netwerk gekoppel is nie."\n\n"Hierdie instelling beïnvloed alle gebruikers op hierdie tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"As jy mobiele data in die agtergrond beperk, sal sommige programme en dienste nie werk tensy jy aan \'n Wi-Fi-netwerk gekoppel is nie."\n\n"Hierdie instelling beïnvloed alle gebruikers op hierdie foon."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"As jy mobiele data in die agtergrond beperk, sal sommige programme en dienste nie werk tensy jy aan \'n Wi-Fi-netwerk gekoppel is nie.\n\nHierdie instelling beïnvloed alle gebruikers op hierdie tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"As jy mobiele data in die agtergrond beperk, sal sommige programme en dienste nie werk tensy jy aan \'n Wi-Fi-netwerk gekoppel is nie.\n\nHierdie instelling beïnvloed alle gebruikers op hierdie foon."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"waarsku"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limiet"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Verwyderde programme"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Gebruiker"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Beperkte profiel"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Voeg nuwe gebruiker by"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Jy kan hierdie toestel met ander mense deel deur bykomende gebruikers te skep. Elke gebruiker het sy eie ruimte, wat hulle met hul eie programme, muurpapier, ensovoorts kan pasmaak. Gebruikers kan ook tabletinstellings verstel wat almal affekteer, soos Wi-Fi."\n\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_add_user_message_long" msgid="3086244205384741788">"Jy kan hierdie toestel met ander mense deel deur bykomende gebruikers te skep. Elke gebruiker het sy eie ruimte, wat hulle met hul eie programme, muurpapier, ensovoorts kan pasmaak. Gebruikers kan ook tabletinstellings verstel wat almal affekteer, soos Wi-Fi.\n\nNadat jy \'n nuwe gebruiker geskep het, moet daardie persoon deur \'n opstelproses gaan.\n\nEnige gebruiker kan opgedateerde programtoestemmings namens al die ander gebruikers aanvaar."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Nadat jy \'n nuwe gebruiker geskep het, moet daardie persoon deur \'n opstelproses gaan.\n\nEnige gebruiker kan opgedateerde programtoestemmings namens al die ander gebruikers aanvaar."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Moet die gebruiker nou opgestel word?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Maak seker dat die persoon beskikbaar is om die tablet te vat en hulle area op te stel"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Stel profiel nou op?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Hierdie instelling beïnvloed alle gebruikers op hierdie foon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Verander taal"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Verander lettergrootte"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Beperkings"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Verwyder beperkings"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Verander PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Wys kennisgewings"</string>
     <string name="help_label" msgid="1107174367904110532">"Hulp"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Rekening vir die inhoud"</string>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 443bad2b1af..485369ff8b9 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"መገኛ ስፍራ"</item>
     <item msgid="255608127647030286">"የግል"</item>
     <item msgid="4588829735729884491">"መልዕክት መላኪያ"</item>
-    <item msgid="8971765125227378270">"መሣሪያ"</item>
+    <item msgid="886742181977884584">"ማህደረ መረጃ"</item>
+    <item msgid="7924928667052300589">"መሣሪያ"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"ግምታዊ አካባቢ"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"ድምጽ አጫውት"</item>
     <item msgid="8374996688066472414">"ቅንጥብ መለያ አንብብ"</item>
     <item msgid="3045529469061083747">"ቅንጥብ መለያ ቀይር"</item>
+    <item msgid="5124443975763747838">"የሚዲያ አዝራሮች"</item>
+    <item msgid="4547883971364273343">"የድምጽ ትኩረት"</item>
+    <item msgid="2603878814882344450">"ዋናው ድምጽ መቆጣጠሪያ"</item>
+    <item msgid="7136963238377062018">"የድምጽ መጠን"</item>
+    <item msgid="4270236897655923007">"የደወል ድምጽ መጠን"</item>
+    <item msgid="6325739889222559394">"የማህደረ መረጃ መጠን"</item>
+    <item msgid="5762123934816216821">"የማንቂያ ድምፅ መጠን"</item>
+    <item msgid="785049718065337473">"የማሳወቂያ ድምጽ መጠን"</item>
+    <item msgid="6700305533746877052">"የብሉቱዝ ድምፅ መጠን"</item>
+    <item msgid="2029227495214047094">"እንደነቃ አቆይ"</item>
+    <item msgid="26109888160231211">"አካባቢን ይቆጣጠሩ"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"አካባቢ"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"ድምጽ አጫውት"</item>
     <item msgid="136815868796597058">"ቅንጥብ ሰሌዳ አንብብ"</item>
     <item msgid="5238692940326972503">"ቅንጥብ መለያ ቀይር"</item>
+    <item msgid="5753789168376302997">"የሚዲያ አዝራሮች"</item>
+    <item msgid="3265262911688671938">"የድምጽ ትኩረት"</item>
+    <item msgid="2098976479485046797">"ዋናው የድምጽ መቆጣጠሪያ"</item>
+    <item msgid="5660213838861789350">"የድምጽ መጠን"</item>
+    <item msgid="7983336752371254444">"የደወል ድምጽ መጠን"</item>
+    <item msgid="7878027809189330917">"የማህደረ መረጃ ክፍልፍል"</item>
+    <item msgid="7260546305036218513">"የማንቂያ ድምፅ መጠን"</item>
+    <item msgid="9103719301075748925">"የማሳወቂያ ድምጽ መጠን"</item>
+    <item msgid="7025966722295861512">"የብሉቱዝ ድምፅ መጠን"</item>
+    <item msgid="4665183401128289653">"እንደነቃ አቆይ"</item>
+    <item msgid="8584357129746649222">"አካባቢ"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"አጭር"</item>
     <item msgid="2560532955514699713">"መካከለኛ"</item>
     <item msgid="2372711992605524591">"ረጅም"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (ስህተት አርም)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Dalvik ይጠቀሙ"</item>
+    <item msgid="5131846588686178907">"ART ይጠቀሙ"</item>
+    <item msgid="4530003713865319928">"ART ስህተት የማረም ግንባታ ይጠቀሙ"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"በፍፁም አትመልከት"</item>
     <item msgid="6042769699089883931">"የDRM ይዘት ብቻ ተመልከት"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"ማያ ገጽ ላይ እንደ መስመሮች"</item>
     <item msgid="120512413928262547">"በ adb shell dumpsys gfxinfo ውስጥ"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"ጠፍቷል"</item>
+    <item msgid="7688197031296835369">"ስዕሉ አልፎ የፈሰሰባቸው አካባቢዎችን አሳይ"</item>
+    <item msgid="8332661909019981149">"የአልፎ ፍሰት ቆጣሪውን አሳይ"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"መደበኛ ወሰኖች"</item>
     <item msgid="4071574792028999443">"ምንም የዳራ ሂደቶች የሉም"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 90a7122c4cd..ab9afbbda03 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -275,8 +275,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_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>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"ጡባዊዎን ባበሩ ቁጥር ለመፍታት የቁጥር PIN  ወይም ይለፍ ቃል ጠይቅ"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"ስልክዎን ባበሩ ቁጥር ለመፍታት የቁጥር PIN  ወይም ይለፍ ቃል ጠይቅ"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"ተመሳጥሯል"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"መለያዎችን፣ ቅንብሮች ፣የወረዱ መተግበሪያዎች እና የነሱን ውሂብ፣ማህደረ መረጃ ፣እና ሌላ ፋይሎች ማመሳጠር ይችላሉ። ጡባዊ ተኮዎን ምስጠራ አፈታት አንዴ ካደረጉ በኋላ፣በእያንዳንዱ ጊዜ ሲያበሩት ላለማመሳጠር የቁጥር ፒን ወይም የይለፍ ቃል መተየብ ያስፈልግዎታል፡- የፋብሪካው ውሂብ ዳግም አስጀምር በመተግበር በስተቀር ጡባዊ ተኮዎን አለማመሳጠር አይችሉም፤ሁሉንም ውሂብ በማጥፋት።"\n\n" ምስጠራ አንድ ሰዓት ወይም ከዛ በላይ ሊፈጅ ይችላል። በተሞላ ባትሪ መጀመር አለብዎ እና ምስጠራ እስኪጠናቀቅ ጡባዊ ተኮዎ እንደተሰካ ይሁን።የምስጠራውን ሂደት ካቋረጡ፣ውሂብዎን አንዳንዱን ወይም ሁሉንም ያጣሉ።"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"መለያዎችን፣ ቅንብሮች ፣የወረዱ መተግበሪያዎች እና የነሱን ውሂብ፣ማህደረ  መረጃ ፣እና ሌላ ፋይሎች ማመሳጠር ትችላለህ።  ስልክህን ምስጠራ አፈታት አንዴ ካደረክ በኋላ፣በእያንዳንዱ ጊዜ ስታበራው ላለማመሳጠር የቁጥር ፕን ወይም የይለፍ ቃል መተየብ ያስፈልግሃል። የፋብሪካው ውሂብ ዳግም አስጀምር በመተግበር በስተቀር ስልክህን አለማመሳጠር አትችልም፤ሁሉንም ውሂብ በማጥፋት።"\n\n" ምስጠራ አንድ ሰዓት ወይም ከዛ በላይ ሊፈጅ ይችላል። በተሞላ ባትሪ መጀመር አለብህ እና ምስጠራ እስኪጠናቀቅ ስልክህ እንደተሰካ ይሁን።የምስጠራውን ሂደት ካቋረጥክ፣ውሂብህን አንዳንዱን ወይም ሁሉንም ታጣለህ።"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"መለያዎችን፣ ቅንብሮች ፣የወረዱ መተግበሪያዎች እና የነሱን ውሂብ፣ማህደረ መረጃ ፣እና ሌላ ፋይሎች ማመሳጠር ይችላሉ። ጡባዊ ተኮዎን ምስጠራ አፈታት አንዴ ካደረጉ በኋላ፣በእያንዳንዱ ጊዜ ሲያበሩት ላለማመሳጠር የቁጥር ፒን ወይም የይለፍ ቃል መተየብ ያስፈልግዎታል፡- የፋብሪካው ውሂብ ዳግም አስጀምር በመተግበር በስተቀር ጡባዊ ተኮዎን አለማመሳጠር አይችሉም፤ሁሉንም ውሂብ በማጥፋት።\n\n ምስጠራ አንድ ሰዓት ወይም ከዛ በላይ ሊፈጅ ይችላል። በተሞላ ባትሪ መጀመር አለብዎ እና ምስጠራ እስኪጠናቀቅ ጡባዊ ተኮዎ እንደተሰካ ይሁን።የምስጠራውን ሂደት ካቋረጡ፣ውሂብዎን አንዳንዱን ወይም ሁሉንም ያጣሉ።"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"መለያዎችን፣ ቅንብሮች ፣የወረዱ መተግበሪያዎች እና የነሱን ውሂብ፣ማህደረ  መረጃ ፣እና ሌላ ፋይሎች ማመሳጠር ትችላለህ።  ስልክህን ምስጠራ አፈታት አንዴ ካደረክ በኋላ፣በእያንዳንዱ ጊዜ ስታበራው ላለማመሳጠር የቁጥር ፕን ወይም የይለፍ ቃል መተየብ ያስፈልግሃል። የፋብሪካው ውሂብ ዳግም አስጀምር በመተግበር በስተቀር ስልክህን አለማመሳጠር አትችልም፤ሁሉንም ውሂብ በማጥፋት።\n\n ምስጠራ አንድ ሰዓት ወይም ከዛ በላይ ሊፈጅ ይችላል። በተሞላ ባትሪ መጀመር አለብህ እና ምስጠራ እስኪጠናቀቅ ስልክህ እንደተሰካ ይሁን።የምስጠራውን ሂደት ካቋረጥክ፣ውሂብህን አንዳንዱን ወይም ሁሉንም ታጣለህ።"</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"ጡባዊ አመስጥር"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"ስልክ አመስጥር"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"እባክዎ ባትሪዎን ኃይል ይሙላ እና እንደገና ይሞክሩ።"</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"በ <xliff:g id="DELAY">^1</xliff:g>ሰከንዶች ውስጥ እንደገና ሞክር።"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"የይለፍቃልህን ተይብ"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ምስጠራ ስኬታማ አልነበረም"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"ማመስጠር ተቆራርጧል እና መጨረስ አይችልም። በመሆኑም፣ በጡባዊዎ ላይ ያለውን ውሂብ እስከነጭራሹ መድረስ አይቻልም። "\n\n" ጡባዊህን በመጠቀም ለመቀጠል፣ የፋብሪካ ዳግም አስጀምር ማከናወን አለብህ። ጡባዊህን ዳግም ካስጀመርክ በኋላ ስታዘጋጅ፣ ወደ Google መለያህ አስጠብቀህ የነበረውን ውሂብ እነበረበት ለመመለስ እድሉን ታገኛለህ።"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"ማመስጠር ተቆራርጧል እና መጨረስ አይችልም። በመሆኑም፣ በስልክህ ላይ ያለውን ውሂብ እስከነጭራሹ መድረስ አይቻልም። "\n\n" ስልክህን በመጠቀም ለመቀጠል፣ የፋብሪካ ዳግም አስጀምር ማከናወን አለብህ። ስልክህን ዳግም ካስጀመርክ በኋላ ስታዘጋጅ፣ ወደ Google መለያህ አስጠብቀህ የነበረውን ውሂብ እነበረበት ለመመለስ እድሉን ታገኛለህ።"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"ማመስጠር ተቆራርጧል እና መጨረስ አይችልም። በመሆኑም፣ በጡባዊዎ ላይ ያለውን ውሂብ እስከነጭራሹ መድረስ አይቻልም። \n\n ጡባዊህን በመጠቀም ለመቀጠል፣ የፋብሪካ ዳግም አስጀምር ማከናወን አለብህ። ጡባዊህን ዳግም ካስጀመርክ በኋላ ስታዘጋጅ፣ ወደ Google መለያህ አስጠብቀህ የነበረውን ውሂብ እነበረበት ለመመለስ እድሉን ታገኛለህ።"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"ማመስጠር ተቆራርጧል እና መጨረስ አይችልም። በመሆኑም፣ በስልክህ ላይ ያለውን ውሂብ እስከነጭራሹ መድረስ አይቻልም። \n\n ስልክህን በመጠቀም ለመቀጠል፣ የፋብሪካ ዳግም አስጀምር ማከናወን አለብህ። ስልክህን ዳግም ካስጀመርክ በኋላ ስታዘጋጅ፣ ወደ Google መለያህ አስጠብቀህ የነበረውን ውሂብ እነበረበት ለመመለስ እድሉን ታገኛለህ።"</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"የግቤት ስልት ቀይር"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"ማሳያ ቆልፍ ምረጥ"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"ምትኬ ቆላፊ ምረጥ"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"በመገናኘት ላይ"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"ተገናኝቷል"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"የሚገኙ"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"በስራ ላይ ያሉ"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"የማሳያ ቅንብሮች"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"ግንኙነቱ ይቋረጥ?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"ይሄ ከዚህ ጋር ያለዎትን ግንኙነት ያስቆመዋል፦&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,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="8850161330437693895">"Wi‑Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"በ <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> የተጠበቀ"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"፣ በ<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> የተጠበቀ"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"የለም"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> የአካባቢ ትክክለኛነትን ለማሻሻል እና ለሌሎች ዓላማዎች የአውታረ መረብ መቃኘትን ማብራት ይፈልጋል፣ Wi-Fi ጠፍቶ ቢሆንም እንኳ።"\n\n"ይሄ ለሁሉም መቃኘት ለሚፈልጉ መተግበሪያዎች ይፈቀድ?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> የአካባቢ ትክክለኛነትን ለማሻሻል እና ለሌሎች ዓላማዎች የአውታረ መረብ መቃኘትን ማብራት ይፈልጋል፣ Wi-Fi ጠፍቶ ቢሆንም እንኳ።\n\nይሄ ለሁሉም መቃኘት ለሚፈልጉ መተግበሪያዎች ይፈቀድ?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ፍቀድ"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"ከልክል"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"አያይዝ"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"ማስጠንቀቂያ፦ ተጨማሪ የድምጸ ሞደም ተያያዥ ውሂብ ክፍያዎች ሊከሰትብዎ ይችላል።\n\nጡባዊን ማዋቀር ጉልህ የሆነ የአውታረ መረብ እንቅስቃሴ ሊያስፈልገው ይችላል።"</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ማስጠንቀቂያ፦ ተጨማሪ የድምጸ ሞደም ተያያዥ ውሂብ ክፍያዎች ሊከሰትብዎ ይችላል።\n\nስልክን ማዋቀር ጉልህ የሆነ የአውታረ መረብ እንቅስቃሴ ሊያስፈልገው ይችላል።"</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ማስጠንቀቂያ: የበይነመረብ ግንኙነት እስኪኖርዎት ድረስ ሶፍትዌርዎ የዘመነ መሆኑን ታብሌቱ ማረጋገጥ አይችልም።"</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ማስጠንቀቂያ: የበይነመረብ ግንኙነት እስኪኖርዎት ድረስ ሶፍትዌርዎ የዘመነ መሆኑን ስልኩ ማረጋገጥ አይችልም።"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"ጡባዊው ከዚህ የWi-Fi አውታረ መረብ ጋር መገናኘት አልቻለም።"</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"የተሳሳተ ፒን!"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"ፒኖቹ አይዛመዱም"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"ፒን መለወጥ አይቻልም::"\n" ምናልባት ልክ ያልኾነ ፒን ሊሆን ይችላል::"</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"ፒን መለወጥ አይቻልም::\n ምናልባት ልክ ያልኾነ ፒን ሊሆን ይችላል::"</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN በተሳካ ተለውጧል"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"የሲም ካርድን ቆልፍ ሁኔታ ለመለወጥ አይቻልም። "\n" የተሳሳተ ፒን ሊሆን ይችላል።"</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"የሲም ካርድን ቆልፍ ሁኔታ ለመለወጥ አይቻልም። \n የተሳሳተ ፒን ሊሆን ይችላል።"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"እሺ"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ይቅር"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"የጡባዊ ኹነታ"</string>
@@ -918,11 +919,11 @@
     <string name="master_clear_title" msgid="5907939616087039756">"የፋብሪካ ውሂብ ዳግም አስጀምር"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"በስልኩ ላይ ያለ ውሂብ ሁሉ ያጠፋል"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"በስልኩ ላይ ያለውን ውሂብ ሁሉ አጥፋ"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ይህ ከእርስዎ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:"\n\n<li>"የእርስዎ  Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል።"</string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ይህ ከእርስዎ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:"\n\n<li>"የእርስዎ  Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል።"</string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n" እርስዎ በአሁን ጊዜ የሚከተለው መለያዎች ውስጥ ገብተዋል፡"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"ይህ ከእርስዎ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:\n\n"<li>"የእርስዎ  Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል።"</string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"ይህ ከእርስዎ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" የሚከተሉትን ጨምሮ:\n\n"<li>"የእርስዎ  Google መለያ"</li>\n<li>"ሥርዓት እና መተግበሪያ ውሂብ እና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li>" ላይ ያሉ ሁሉንም ውሂብ ይሰርዛል።"</string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n" እርስዎ በአሁን ጊዜ የሚከተለው መለያዎች ውስጥ ገብተዋል፡\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"ሙዚቃ"</li>\n<li>"ፎቶዎች"</li>\n<li>"ሌላ የተጠቃሚ ውሂብ"</li></string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ "\n\n"ለማጥራት፣"<b>"USBማከማቻ"</b>" መጥፋት ያስፈልገዋል።"</string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ \n\nለማጥራት፣"<b>"USBማከማቻ"</b>" መጥፋት ያስፈልገዋል።"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n" ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ ለማጥራት፣"<b>" የSD ካርድ "</b>"መጥፋት ያስፈልገዋል።"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB ማከማቻ አጥፋ"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"የSD ካርድ አጥፋ"</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"የተሸጎጡ ሂደቶችን አሳይ"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"የመተግበሪያዎች ምርጫዎችን ዳግም አስጀምር"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"የመተግበሪያዎች ምርጫዎች ዳግም ይጀመሩ?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"ይሄ የእነዚህን ሁሉ ምርጫዎች ዳግም ያስጀምራል፦"\n\n" "<li>"የተሰናከሉ መተግበሪያዎች"</li>\n" "<li>"የተሰናከሉ የመተግበሪያዎች ማሳወቂያዎች"</li>\n" "<li>"የእርምጃዎች ነባሪ መተግበሪያዎች"</li>\n" "<li>"የመተግበሪያዎች የጀርባ ውሂብ ገደቦች"</li>\n\n" ምንም የመተግበሪያ ውሂብ አታጣም።"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"ይሄ የእነዚህን ሁሉ ምርጫዎች ዳግም ያስጀምራል፦\n\n "<li>"የተሰናከሉ መተግበሪያዎች"</li>\n" "<li>"የተሰናከሉ የመተግበሪያዎች ማሳወቂያዎች"</li>\n" "<li>"የእርምጃዎች ነባሪ መተግበሪያዎች"</li>\n" "<li>"የመተግበሪያዎች የጀርባ ውሂብ ገደቦች"</li>\n\n" ምንም የመተግበሪያ ውሂብ አታጣም።"</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"መተግበሪያዎችን ዳግም አስጀምር"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"ባዶ ቦታ አደራጅ"</string>
     <string name="filter" msgid="2018011724373033887">"አጣራ"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"ለመቀየር፣ Control-Spacebar ተጫን"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"ነባሪ"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"የቁልፍ ሰሌዳ አቀማመጥ"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"የተጠቃሚ መዝገበ ቃላት"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"የግል መዝገበ ቃላት"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"የግል መዝገበ ቃላቶች"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"የግል መዝገበ-ቃላት"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"አክል"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"ወደ መዝገበ ቃላት አክል"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"የሳንካ ሪፖርት ለመውሰድ የኃይል ምናሌ ውስጥ አማራጩን ያካትቱ"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"ነቅተህ ቆይ"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"ማያኃይል በመሙላት ላይበፍፁም አይተኛም"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"የብሉቱዝ HCI ስለላ ምዝግብ ማስታወሻን ያንቁ"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"በአንድ ፋይል ውስጥ ያሉትን የብሉቱዝ HCI እሽጎች ይቅረጹ"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"የሚፈጀውን ጊዜ ይምረጡ"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"የሚፈጀውን ጊዜ ይምረጡ"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"የሚፈጀውን ጊዜ ከ<xliff:g id="OLD">%1$s</xliff:g> ወደ <xliff:g id="NEW">%2$s</xliff:g> ለመለወጥ ዳግም ይጀምር?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"አስቂኝ ሥፍራዎችን ፍቀድ"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"አስቂኝ ሥፍራዎችን ፍቀድ"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"የUSB ማረሚያ ይፈቀድ?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"የUSB ማከማቻ ጠብቅ"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"መተግበሪያዎች የUSB ማከማቻ እንዲያነቡ ፍቃድ መጠየቅ አለባቸው"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"የUSB ማከማቻ ይጠበቅ?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"የUSB ማከማቻ የተጠበቀ ሲሆን መተግበሪያዎች ከውጫዊ ማከማቻ ውሂብ እንዲያነቡ ፍቃድ መጠየቅ አለባቸው።"\n\n"አንዳንድ መተግበሪያዎች በገንቢዎቻቸው እስኪዘመኑ ድረስ ላይሰሩ ይችላሉ።"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"የUSB ማከማቻ የተጠበቀ ሲሆን መተግበሪያዎች ከውጫዊ ማከማቻ ውሂብ እንዲያነቡ ፍቃድ መጠየቅ አለባቸው።\n\nአንዳንድ መተግበሪያዎች በገንቢዎቻቸው እስኪዘመኑ ድረስ ላይሰሩ ይችላሉ።"</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"የSD ካርድ ጠብቅ"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"መተግበሪያዎች የSD ካርድ እንዲያነቡ ፍቃድ መጠየቅ አለባቸው"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"የSD ካርድ ይጠበቅ?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"የSD ካርድ የተጠበቀ ሲሆን መተግበሪያዎች ከውጫዊ ማከማቻ ውሂብ እንዲያነቡ ፍቃድ መጠየቅ አለባቸው።"\n\n"አንዳንድ መተግበሪያዎች በገንቢዎቻቸው እስኪዘመኑ ድረስ ላይሰሩ ይችላሉ።"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"የSD ካርድ የተጠበቀ ሲሆን መተግበሪያዎች ከውጫዊ ማከማቻ ውሂብ እንዲያነቡ ፍቃድ መጠየቅ አለባቸው።\n\nአንዳንድ መተግበሪያዎች በገንቢዎቻቸው እስኪዘመኑ ድረስ ላይሰሩ ይችላሉ።"</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"አካባቢያዊ ተርሚናል"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"የአካባቢያዊ ሼል መዳረሻ የሚያቀርብ የተርሚናል መተግበሪያ አንቃ"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"መሣሪያ ምረጥ"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"ፍርግም ምረጥ"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"አዲስ ምግብር ፍጠር አና መዳረሻ ፍቀድለት?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"አገልግሎቶች"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"ስርዓት"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"የማጉላት ምልክቶች"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"ይሄ ባህሪ ሲበራ ማያ ገጹን ሶስቴ መታ በማድረግ ማጉላት እና ማሳነስ ይችላሉ።"\n\n"አጉልተው ሳሉ እነኚህን ማድረግ ይችላሉ፦"\n<ul><li>"ማንፏቀቅ፦ በማያ ገጹ ላይ ሁለት ወይም ተጨማሪ ጣቶችን ይጎትቱ።"</li>\n<li>"የአጉላ ደረጃን ማስተካከል፦ በሁለት ወይም ተጨማሪ ጣቶች ይቆንጥጡ ወይም ጣቶችዎን ይበትኗቸው።"</li></ul>\n\n"እንዲሁም ሶስቴ መታ በማድረግና በመያዝ ከጣትዎ ስር ያለውን በጊዜያዊነት ማጉላት ይችላሉ። በዚህ የማጉላት ሁኔታ ላይ የማያ ገጹ የተለያዩ ክፍሎችን ለማሰስ ጣትዎን መጎተት ይችላሉ። ወደ ቀዳሚ ሁኔታዎን ለመመለስ ጣትዎን ያንሱ።"\n\n"ማስታወሻ፦ ከቁልፍ ሰሌዳው እና የአሰሳ አሞሌው በስተቀር ለማጉላት ሶስቴ መታ ማድረግ በሁሉም ቦታ ላይ ይሰራል።"</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_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>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack ማየት ለተሳናቸው እና ዝቅተኛ የማየት አቅም ላላቸው ተጠቃሚዎች የንግግር ግብረ መልስ ያቀርባል፡፡ በነጻ ከ Android Market ልትጭነው ትፈልጋለህ?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"ምንም መግለጫ አልቀረበም።"</string>
     <string name="settings_button" msgid="3006713718908152930">"ቅንብሮች"</string>
+    <string name="print_settings" msgid="4742428530112487843">"ማተም"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"የህትመት ቅንብሮች"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"አገልግሎቶች"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> ይጠቀሙ?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> የሚያትሟቸውን ሰነዶች መቀበል ይችላል። እንደዚህ ያሉ ሰነዶች ሚስጥራዊ ውሂብ ሊይዙ ይችላሉ።"</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"ምንም አገልግሎቶች አልተጫኑም"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"ቅንብሮች"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"አታሚዎችን ያክሉ"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"በርቷል"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"ጠፍቷል"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"ባትሪ"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"ባትሪውን ምን እየተጠቀመበት ነበር"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"የባትሪ አጠቃቀም ውሂብ የለም።"</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fiን በማስኬድ ላይ"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"ጡባዊ"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"ስልክ"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"ውሂብ ተልኳል"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"ውሂብ ተቀብሏል"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"የሞባይል ውሂብ ተልኳል"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"የሞባይል ውሂብ ደርሷል"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"የWi‑Fi ውሂብ ተልኳል"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"የWi‑Fi ውሂብ ደርሷል"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"ኦዲዮ"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"ቪዲዮ"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"በሰዓቱ"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"ቅላፄ"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"የሚነገረው ፅሁፍ ድምፅ ላይ ተፅዕኖ ያሳድራል"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"ቋንቋ"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"ቋንቋ አልተመረጠም"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"ለሚነገረው ፅሁፍ ቋንቋ-ተኮር ድምፅ አዘጋጅ"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"ምሳሌውን አዳምጥ"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"አጭር የንግግር ልምምድ ማሳያ አጫውት"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP አይደገፍም::"</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"በማዋቀር ላይ ሳሉ የEAP Wi-Fi ግንኙነት ማዋቀር አይችሉም። ካዋቀሩ በኋላ ያንን በቅንብሮች &gt; ገመድ አልባ እና አውታረ መረቦች ውስጥ ማድረግ ይችላሉ።"</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"ማገናኘቱ የተወሰነ ደቂቃ ሊወስድ ይችላል..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"ማዋቀሩን ለመቀጠል "<b>"ቀጣይ"</b>"ን ይንኩ።"\n\n"ከተለየ የWi-Fi አውታረ መረብ ጋር ለመገናኘት "<b>"ተመለስ"</b>"ን ይንኩ።"</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"ማዋቀሩን ለመቀጠል "<b>"ቀጣይ"</b>"ን ይንኩ።\n\nከተለየ የWi-Fi አውታረ መረብ ጋር ለመገናኘት "<b>"ተመለስ"</b>"ን ይንኩ።"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"አሳምርነቅቷል"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"አስምር ቦዝኗል"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"የአሳምር ስህተት።"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"የጂፒዩ አልፎ መሳል አርም"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"የHW ተደራቢዎችን አሰናክል"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"ለማያ ገጽ ማቀናበሪያ ሁልጊዜ GPU ተጠቀም"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"የ OpenGL ክትትሎችን ያንቁ"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"የጀርባ ውሂብ በተንቀሳቃሽ ስልክ አውታረ መረብ ላይ አሰናክል። ከተገኙ የተንቀሳቃሽ ስልክ ያልሆኑ አውታረ መረቦች ስራ ላይ ይውላሉ።"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"ለእዚህ ትግበራ የዳራ ውሂብ ለመገደብ፣ መጀመሪያ የተንቀሳቃሽ ውሂብ ወሰን አዘጋጅ።"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"ዳራ ውሂብ አግድ?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"ይሄ ባህሪ የተንቀሳቃሽ ስልክ አውታረ መረቦች ብቻ የሚገኙ ከሆኑ በጀርባ ውሂብ ላይ የሚወሰኑ መተግበሪያዎች ስራቸውን እንዲያቆሙ ሊያደርግ ይችላል።"\n\n"በመተግበሪያው ቅንብሮች ውስጥ ተገቢ የሆኑ ተጨማሪ የአጠቃቀም መቆጣጠሪያዎችን ልታገኝ ትችላለህ።"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"ይሄ ባህሪ የተንቀሳቃሽ ስልክ አውታረ መረቦች ብቻ የሚገኙ ከሆኑ በጀርባ ውሂብ ላይ የሚወሰኑ መተግበሪያዎች ስራቸውን እንዲያቆሙ ሊያደርግ ይችላል።\n\nበመተግበሪያው ቅንብሮች ውስጥ ተገቢ የሆኑ ተጨማሪ የአጠቃቀም መቆጣጠሪያዎችን ልታገኝ ትችላለህ።"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"የተንቀሳቃሽ ስልክ ውሂብ ወሰን ሲያዘጋጁ ብቻ ነው የዳራ ውሂብ መገደብ የሚቻለው።"</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ውሂብ ራስ-አመሳስል ይብራ?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"ድር ላይ በመለያዎችህ ላይ የምታደርጋቸው ማንኛውም ለውጦች በራስ-ሰር ወደ ጡባዊ ቱኮህ ይገለበጣሉ።"\n\n"አንዳንድ መለያዎች ጡባዊ ቱኮህ ላይ የምታደርጋቸውን ለውጦች በራስ-ሰር ወደ ድር ላይ መገልበጥም ይችላሉ። የGoogle መለያ እንዲህ ነው የሚሰራው።"\n\n"የትኞቹ አይነት መረጃዎች ከእያንዳንዱ መለያ ጋር ማመሳሰል እንደምትፈልግ ለመምረጥ ወደ ቅንብሮች &gt; መለያዎች ሂድ።"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"ድር ላይ በመለያዎችህ ላይ የምታደርጋቸው ማንኛውም ለውጦች በራስ-ሰር ወደ ስልክህ ይገለበጣሉ።"\n\n"አንዳንድ መለያዎች ስልክ ላይ የምታደርጋቸውን ለውጦች በራስ-ሰር ወደ ድር ላይ መገልበጥም ይችላሉ። የGoogle መለያ እንዲህ ነው የሚሰራው።"\n\n"የትኞቹ አይነት መረጃዎች ከእያንዳንዱ መለያ ጋር ማመሳሰል እንደምትፈልግ ለመምረጥ ወደ ቅንብሮች &gt; መለያዎች ሂድ።"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"ድር ላይ በመለያዎችህ ላይ የምታደርጋቸው ማንኛውም ለውጦች በራስ-ሰር ወደ ጡባዊ ቱኮህ ይገለበጣሉ።\n\nአንዳንድ መለያዎች ጡባዊ ቱኮህ ላይ የምታደርጋቸውን ለውጦች በራስ-ሰር ወደ ድር ላይ መገልበጥም ይችላሉ። የGoogle መለያ እንዲህ ነው የሚሰራው።\n\nየትኞቹ አይነት መረጃዎች ከእያንዳንዱ መለያ ጋር ማመሳሰል እንደምትፈልግ ለመምረጥ ወደ ቅንብሮች &gt; መለያዎች ሂድ።"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"ድር ላይ በመለያዎችህ ላይ የምታደርጋቸው ማንኛውም ለውጦች በራስ-ሰር ወደ ስልክህ ይገለበጣሉ።\n\nአንዳንድ መለያዎች ስልክ ላይ የምታደርጋቸውን ለውጦች በራስ-ሰር ወደ ድር ላይ መገልበጥም ይችላሉ። የGoogle መለያ እንዲህ ነው የሚሰራው።\n\nየትኞቹ አይነት መረጃዎች ከእያንዳንዱ መለያ ጋር ማመሳሰል እንደምትፈልግ ለመምረጥ ወደ ቅንብሮች &gt; መለያዎች ሂድ።"</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ውሂብ ራስ-አመሳስል ይጥፋ?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"ይሄ የውሂብ እና የባትሪ አጠቃቀም ይቆጥባል፣ ግን የቅርብ ጊዜ መረጃ ለመሰብሰብ እያንዳንዱን መለያ እየመረጥክ ማመሳሰል ይኖርብሃል። እናም ዝማኔዎች ሲኖሩ ምንም ማሳወቂያዎች አይደርሱህም።"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"የአጠቃቀም ዑደት ቀን ዳግም ያስጀምራል"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"የውሂብ አጠቃቀም ማስጠንቀቂያ አዘጋጅ"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"የውሂብ አጠቃቀም ወሰን አዘጋጅ"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"የውሂብ አጠቃቀም መወሰን"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"የተንቀሳቃሽ ስልክ ውሂብ ማገናኛ የተጠቀሰው ገደብ ላይ ሲደረስ ይሰናከላል።"\n\n"የውሂብ አጠቃቀም በጡባዊ ቱኮህ መሰረት የሚሰፈር እንደመሆኑ መጠን እና ድምጸ ተያያዥ ሞደምህ ለአጠቃቀም በተለየ ሁኔታ ሊሰፍር ስለሚችል፣ ቆጠብ ያለ ገደብ መጠቀሙን ግምት ውስጥ አስገባ።"</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"የተንቀሳቃሽ ስልክ ውሂብ ማገናኛ የተጠቀሰው ገደብ ላይ ሲደረስ ይሰናከላል።"\n\n"የውሂብ አጠቃቀም በስልክህ መሰረት የሚሰፈር እንደመሆኑ መጠን፣ እና ድምጸ ተያያዥ ሞደምህ ለአጠቃቀም በተለየ ሁኔታ ሊሰፍር ስለሚችል፣ ቆጠብ ያለ ገደብ መጠቀሙን ግምት ውስጥ አስገባ።"</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"የተንቀሳቃሽ ስልክ ውሂብ ማገናኛ የተጠቀሰው ገደብ ላይ ሲደረስ ይሰናከላል።\n\nየውሂብ አጠቃቀም በጡባዊ ቱኮህ መሰረት የሚሰፈር እንደመሆኑ መጠን እና ድምጸ ተያያዥ ሞደምህ ለአጠቃቀም በተለየ ሁኔታ ሊሰፍር ስለሚችል፣ ቆጠብ ያለ ገደብ መጠቀሙን ግምት ውስጥ አስገባ።"</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"የተንቀሳቃሽ ስልክ ውሂብ ማገናኛ የተጠቀሰው ገደብ ላይ ሲደረስ ይሰናከላል።\n\nየውሂብ አጠቃቀም በስልክህ መሰረት የሚሰፈር እንደመሆኑ መጠን፣ እና ድምጸ ተያያዥ ሞደምህ ለአጠቃቀም በተለየ ሁኔታ ሊሰፍር ስለሚችል፣ ቆጠብ ያለ ገደብ መጠቀሙን ግምት ውስጥ አስገባ።"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"ዳራ ውሂብ አግድ?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"የተንቀሳቃሽ ስልክ ውሂብ ዳራን ከገደቡ ወደ Wi-Fi አውታረ መረብ ካልተገናኙ በስተቀር አንዳንድ መተግበሪያዎች እና አገልግሎቶች አይሰሩም።"</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"የተንቀሳቃሽ ስልክ ውሂብ ዳራን ከገደቡ ወደ Wi-Fi አውታረ መረብ ካልተገናኙ በስተቀር አንዳንድ መተግበሪያዎች እና አገልግሎቶች አይሰሩም።"\n\n"ይህ ቅንብር እዚህ ጡባዊ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"የተንቀሳቃሽ ስልክ ውሂብ ዳራን ከገደቡ ወደ Wi-Fi አውታረ መረብ ካልተገናኙ በስተቀር አንዳንድ መተግበሪያዎች እና አገልግሎቶች አይሰሩም።"\n\n"ይህ ቅንብር እዚህ ስልክ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"የተንቀሳቃሽ ስልክ ውሂብ ዳራን ከገደቡ ወደ Wi-Fi አውታረ መረብ ካልተገናኙ በስተቀር አንዳንድ መተግበሪያዎች እና አገልግሎቶች አይሰሩም።\n\nይህ ቅንብር እዚህ ጡባዊ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"የተንቀሳቃሽ ስልክ ውሂብ ዳራን ከገደቡ ወደ Wi-Fi አውታረ መረብ ካልተገናኙ በስተቀር አንዳንድ መተግበሪያዎች እና አገልግሎቶች አይሰሩም።\n\nይህ ቅንብር እዚህ ስልክ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ማስጠንቀቂያ  "</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ወሰን"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"የተወገዱ ትግበራዎች"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"ተጠቃሚ"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"የተገደበ መገለጫ"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"አዲሰ ተጠቃሚ አክል"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"ተጨማሪ ተጠቃሚዎችን በመፍጠር ይህን መሣሪያ ለሌሎች ሰዎች ማጋራት ይችላሉ። እያንዳንዱ ተጠቃሚ በራሱ መተግበሪያዎች፣ የግድግዳ ወረቀት እና በመሳሰሉት ነገሮች ሊያበጅ የሚችለውን የራሱ ቦታ አለው። ተጠቃሚዎች እንዲሁም ሁሉም ሰው ላይ ተፅዕኖ የሚኖራቸው እንደ Wi-Fi ያሉ የጡባዊ ቅንብሮችን ማስተካከል ይችላሉ።"\n\n"አንድ አዲስ ተጠቃሚ ከፈጠሩ ያ ሰው በማዋቀር ሂደት ውስጥ ማለፍ አለበት።"\n\n"ማንኛውም ተጠቃሚ ሌሎች ተጠቃሚዎችን ወክሎ የተዘመኑ የመተግበሪያ ፍቃዶችን ሊቀበል ይችላል።"</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"አዲስ ተጠቃሚ ከፈጠሩ ያ ሰው በማዋቀር ሂደት ውስጥ ማለፍ አለበት።"\n\n"ማንኛውም ተጠቃሚ ሌሎች ተጠቃሚዎችን ወክሎ የተዘመኑ የመተግበሪያ ፍቃዶችን ሊቀበል ይችላል።"</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"ተጨማሪ ተጠቃሚዎችን በመፍጠር ይህን መሣሪያ ለሌሎች ሰዎች ማጋራት ይችላሉ። እያንዳንዱ ተጠቃሚ በራሱ መተግበሪያዎች፣ የግድግዳ ወረቀት እና በመሳሰሉት ነገሮች ሊያበጅ የሚችለውን የራሱ ቦታ አለው። ተጠቃሚዎች እንዲሁም ሁሉም ሰው ላይ ተፅዕኖ የሚኖራቸው እንደ Wi-Fi ያሉ የጡባዊ ቅንብሮችን ማስተካከል ይችላሉ።\n\nአንድ አዲስ ተጠቃሚ ከፈጠሩ ያ ሰው በማዋቀር ሂደት ውስጥ ማለፍ አለበት።\n\nማንኛውም ተጠቃሚ ሌሎች ተጠቃሚዎችን ወክሎ የተዘመኑ የመተግበሪያ ፍቃዶችን ሊቀበል ይችላል።"</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"አዲስ ተጠቃሚ ከፈጠሩ ያ ሰው በማዋቀር ሂደት ውስጥ ማለፍ አለበት።\n\nማንኛውም ተጠቃሚ ሌሎች ተጠቃሚዎችን ወክሎ የተዘመኑ የመተግበሪያ ፍቃዶችን ሊቀበል ይችላል።"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"ተጠቃሚ አሁን ይዋቀር?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"ሰውዬው ጡባዊውን ወስዶ ቦታውን እንዲያዋቅር የሚገኝ መሆኑን ያረጋግጡ"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"መገለጫ አሁን ይዋቀር?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"ይህ ቅንብር እዚህ ስልክ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"ቋንቋ ይቀይሩ"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"የቅርጸ-ቁምፊ መጠን ይቀይሩ"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"ገደቦች"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"ገደቦችን አስወግድ"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"ፒን ቀይር"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"ማሳወቂያዎች አሳይ"</string>
     <string name="help_label" msgid="1107174367904110532">"እገዛ"</string>
     <string name="user_account_title" msgid="1127193807312271167">"መለያ ለይዘት"</string>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index aaa29c7563f..0cb307402b1 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"الموقع"</item>
     <item msgid="255608127647030286">"شخصية"</item>
     <item msgid="4588829735729884491">"المراسلة"</item>
-    <item msgid="8971765125227378270">"الجهاز"</item>
+    <item msgid="886742181977884584">"الوسائط"</item>
+    <item msgid="7924928667052300589">"الجهاز"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"الموقع التقريبي"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"تشغيل الصوت"</item>
     <item msgid="8374996688066472414">"قراءة الحافظة"</item>
     <item msgid="3045529469061083747">"تعديل الحافظة"</item>
+    <item msgid="5124443975763747838">"أزرار الوسائط"</item>
+    <item msgid="4547883971364273343">"التركيز على الصوت"</item>
+    <item msgid="2603878814882344450">"مستوى الصوت الرئيسي"</item>
+    <item msgid="7136963238377062018">"مستوى الصوت"</item>
+    <item msgid="4270236897655923007">"مستوى صوت الرنين"</item>
+    <item msgid="6325739889222559394">"مستوى صوت الوسائط"</item>
+    <item msgid="5762123934816216821">"مستوى صوت المنبه"</item>
+    <item msgid="785049718065337473">"مستوى صوت الإشعار"</item>
+    <item msgid="6700305533746877052">"مستوى صوت البلوتوث"</item>
+    <item msgid="2029227495214047094">"البقاء في الوضع النشط"</item>
+    <item msgid="26109888160231211">"مراقبة الموقع"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"الموقع"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"تشغيل الصوت"</item>
     <item msgid="136815868796597058">"قراءة الحافظة"</item>
     <item msgid="5238692940326972503">"تعديل الحافظة"</item>
+    <item msgid="5753789168376302997">"أزرار الوسائط"</item>
+    <item msgid="3265262911688671938">"التركيز على الصوت"</item>
+    <item msgid="2098976479485046797">"مستوى الصوت الرئيسي"</item>
+    <item msgid="5660213838861789350">"مستوى الصوت"</item>
+    <item msgid="7983336752371254444">"مستوى صوت الرنين"</item>
+    <item msgid="7878027809189330917">"مستوى صوت الوسائط"</item>
+    <item msgid="7260546305036218513">"مستوى صوت المنبّه"</item>
+    <item msgid="9103719301075748925">"مستوى صوت الإشعار"</item>
+    <item msgid="7025966722295861512">"مستوى صوت البلوتوث"</item>
+    <item msgid="4665183401128289653">"البقاء في الوضع النشط"</item>
+    <item msgid="8584357129746649222">"الموقع"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"قصيرة"</item>
     <item msgid="2560532955514699713">"متوسطة"</item>
     <item msgid="2372711992605524591">"طويلة"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (تصحيح الأخطاء)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"استخدام Dalvik"</item>
+    <item msgid="5131846588686178907">"استخدام ART"</item>
+    <item msgid="4530003713865319928">"استخدام إصدار تصحيح الأخطاء من ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"عدم التحقق مطلقًا"</item>
     <item msgid="6042769699089883931">"التحقق من محتوى DRM فقط"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"على الشاشة كخطوط"</item>
     <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"إيقاف"</item>
+    <item msgid="7688197031296835369">"عرض مناطق تجاوز الحد"</item>
+    <item msgid="8332661909019981149">"عرض مقابل تجاوز الحد"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"الحد القياسي"</item>
     <item msgid="4071574792028999443">"ليست هناك عمليات بالخلفية"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index a8d6b4804ff..bf6893f814d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -275,8 +275,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_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>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"يلزم توفير رقم تعريف شخصي (PIN) رقمي أو كلمة مرور لفك تشفير الجهاز اللوحي في كل مرة يتم فيها تشغيله"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"يلزم توفير رقم تعريف شخصي (PIN) رقمي أو كلمة مرور لفك تشفير الهاتف في كل مرة يتم فيها تشغيله"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"مشفّر"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"يمكنك تشفير الحسابات والإعدادات والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. بعد تشفير الجهاز اللوحي، يلزمك إدخال رقم تعريف شخصي رقمي أو كلمة مرور لإلغاء تشفيره عند كل مرة تجري فيها تشغيله: يتعذر عليك إلغاء تشفير جهازك اللوحي إلا عند إجراء إعادة ضبط بحسب بيانات المصنع وهو ما يؤدي إلى محو جميع البيانات."\n\n"تستغرق عملية التشفير ساعة أو أكثر. يجب البدء ببطارية مشحونة والإبقاء على توصيل الجهاز اللوحي بمصدر الكهرباء حتى تنتهي عملية التشفير. إذا تمت مقاطعة عملية التشفير، فستفقد بعض بياناتك أو كلها."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"يمكنك تشفير الحسابات والإعدادات والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. بعد تشفير الهاتف، يلزمك إدخال رقم تعريف شخصي رقمي أو كلمة مرور لإلغاء تشفيره عند كل مرة تجري فيها تشغيله: يتعذر عليك إلغاء تشفير هاتفك إلا عند إجراء إعادة ضبط بحسب بيانات المصنع وهو ما يؤدي إلى محو جميع البيانات."\n\n"تستغرق عملية التشفير ساعة أو أكثر. يجب البدء ببطارية مشحونة والإبقاء على توصيل هاتفك بمصدر الكهرباء حتى تنتهي عملية التشفير. إذا تمت مقاطعة عملية التشفير، فستفقد بعض بياناتك أو كلها."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"يمكنك تشفير الحسابات والإعدادات والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. بعد تشفير الجهاز اللوحي، يلزمك إدخال رقم تعريف شخصي رقمي أو كلمة مرور لإلغاء تشفيره عند كل مرة تجري فيها تشغيله: يتعذر عليك إلغاء تشفير جهازك اللوحي إلا عند إجراء إعادة ضبط بحسب بيانات المصنع وهو ما يؤدي إلى محو جميع البيانات.\n\nتستغرق عملية التشفير ساعة أو أكثر. يجب البدء ببطارية مشحونة والإبقاء على توصيل الجهاز اللوحي بمصدر الكهرباء حتى تنتهي عملية التشفير. إذا تمت مقاطعة عملية التشفير، فستفقد بعض بياناتك أو كلها."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"يمكنك تشفير الحسابات والإعدادات والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. بعد تشفير الهاتف، يلزمك إدخال رقم تعريف شخصي رقمي أو كلمة مرور لإلغاء تشفيره عند كل مرة تجري فيها تشغيله: يتعذر عليك إلغاء تشفير هاتفك إلا عند إجراء إعادة ضبط بحسب بيانات المصنع وهو ما يؤدي إلى محو جميع البيانات.\n\nتستغرق عملية التشفير ساعة أو أكثر. يجب البدء ببطارية مشحونة والإبقاء على توصيل هاتفك بمصدر الكهرباء حتى تنتهي عملية التشفير. إذا تمت مقاطعة عملية التشفير، فستفقد بعض بياناتك أو كلها."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"تشفير الجهاز اللوحي"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"تشفير الهاتف"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"اشحن البطارية وأعد المحاولة."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"حاول مرة أخرى خلال <xliff:g id="DELAY">^1</xliff:g> ثانية."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"اكتب كلمة المرور"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"لم يتم التشفير بنجاح"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على جهازك اللوحي. "\n\n"لاستئناف استخدام الجهاز اللوحي، يلزمك إجراء إعادة ضبط المصنع. وعند إعداد الجهاز اللوحي بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على هاتفك. "\n\n"لاستئناف استخدام الهاتف، يجب إجراء إعادة ضبط المصنع. وعند إعداد الهاتف بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على جهازك اللوحي. \n\nلاستئناف استخدام الجهاز اللوحي، يلزمك إجراء إعادة ضبط المصنع. وعند إعداد الجهاز اللوحي بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"تمت مقاطعة التشفير ويتعذر الاستكمال. ونتيجة لذلك، لن تتمكن بعد الآن من الدخول إلى البيانات على هاتفك. \n\nلاستئناف استخدام الهاتف، يجب إجراء إعادة ضبط المصنع. وعند إعداد الهاتف بعد إعادة الضبط، ستكون لديك فرصة استعادة أي بيانات تم نسخها احتياطيًا إلى حساب Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"تبديل أسلوب الإدخال"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"اختيار قفل الشاشة"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"اختر قفلاً للنسخ الاحتياطي"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"جارٍ الاتصال"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"متصل"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"متاح"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"قيد الاستخدام"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"عرض الإعدادات"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"هل تريد قطع الاتصال؟"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"سيؤدي هذا إلى إنهاء الاتصال مع:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,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="8850161330437693895">"Wi‑Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"محمي باستخدام <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"، محمي باستخدام <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"لا شيء"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"لتحسين مستوى دقة تحديد الموقع ولأغراض أخرى، يحتاج <xliff:g id="APP_NAME">%1$s</xliff:g> إلى تشغيل البحث عن الشبكات، حتى مع إيقاف Wi-Fi."\n\n"هل تريد السماح بذلك لجميع التطبيقات التي تحتاج إلى فحص؟"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"لتحسين مستوى دقة تحديد الموقع ولأغراض أخرى، يحتاج <xliff:g id="APP_NAME">%1$s</xliff:g> إلى تشغيل البحث عن الشبكات، حتى مع إيقاف Wi-Fi.\n\nهل تريد السماح بذلك لجميع التطبيقات التي تحتاج إلى فحص؟"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"سماح"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"رفض"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"اتصال"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"تحذير: ربما يُحصّل مشغل شبكة الجوال رسومًا إضافية منك.\n\nقد يحتاج إعداد الجهاز اللوحي إلى نشاط كبير بالشبكة."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"تحذير: ربما يحصّل مشغل شبكة الجوال رسومًا إضافية منك.\n\nقد يحتاج إعداد الهاتف إلى نشاط كبير بالشبكة."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"تحذير: ما لم يتوفر لديك اتصال بالإنترنت، لن يتمكن الجهاز اللوحي من التأكد من أن برنامجك محدّث."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"تحذير: ما لم يتوفر لديك اتصال بالإنترنت، لن يتمكن الهاتف من التأكد من أن برنامجك محدّث."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"لم يتمكن الجهاز اللوحي من الاتصال بشبكة Wi-Fi هذه."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"رقم التعريف الشخصي لبطاقة SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"رقم التعريف الشخصي غير صحيح"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"أرقام التعريف الشخصي غير متطابقة"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"لا يمكن تغيير رقم التعريف الشخصي."\n"يحتمل أن يكون رقم التعريف الشخصي غير صحيح."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"لا يمكن تغيير رقم التعريف الشخصي.\nيحتمل أن يكون رقم التعريف الشخصي غير صحيح."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"تم تغيير رقم التعريف الشخصي لبطاقة SIM بنجاح"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"لا يمكن تغيير حالة تأمين بطاقة SIM."\n"يحتمل أن يكون رقم التعريف الشخصي غير صحيح."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"لا يمكن تغيير حالة تأمين بطاقة SIM.\nيحتمل أن يكون رقم التعريف الشخصي غير صحيح."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"موافق"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"إلغاء"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"حالة الجهاز اللوحي"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"إعادة الضبط بحسب بيانات المصنع"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"محو كل البيانات على الجهاز اللوحي"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"مسح جميع بيانات الهاتف"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"يؤدي ذلك إلى مسح جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لجهازك اللوحي، بما في ذلك:"\n\n<li>"حسابك في Google"</li>\n<li>"النظام وبيانات التطبيقات والإعدادات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"يؤدي ذلك إلى مسح جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لهاتفك، بما في ذلك:"\n\n<li>"حسابك في Google"</li>\n<li>"النظام وبيانات التطبيقات والإعدادات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"تم تسجيل دخولك حاليًا في الحسابات التالية:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"يؤدي ذلك إلى مسح جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لجهازك اللوحي، بما في ذلك:\n\n"<li>"حسابك في Google"</li>\n<li>"النظام وبيانات التطبيقات والإعدادات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"يؤدي ذلك إلى مسح جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لهاتفك، بما في ذلك:\n\n"<li>"حسابك في Google"</li>\n<li>"النظام وبيانات التطبيقات والإعدادات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"تم تسجيل دخولك حاليًا في الحسابات التالية:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"الموسيقى"</li>\n<li>"الصور"</li>\n<li>"بيانات المستخدم الأخرى"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"لمحو الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يجب محو "<b>"وحدة تخزين USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"لمحو الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يجب مسح "<b>"بطاقة SD"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"عرض العمليات المخزنة مؤقتًا"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"إعادة تعيين تفضيلات التطبيقات"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"هل تريد إعادة تعيين تفضيلات التطبيقات؟"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"سيؤدي هذا إلى إعادة تعيين جميع تفضيلات:"\n\n" "<li>"التطبيقات المعطلة"</li>\n" "<li>"إشعارات التطبيقات المعطلة"</li>\n" "<li>"التطبيقات الافتراضية للإجراءات"</li>\n" "<li>"قيود بيانات الخلفية للتطبيقات"</li>\n\n" لن تفقد أي بيانات للتطبيقات."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"سيؤدي هذا إلى إعادة تعيين جميع تفضيلات:\n\n "<li>"التطبيقات المعطلة"</li>\n" "<li>"إشعارات التطبيقات المعطلة"</li>\n" "<li>"التطبيقات الافتراضية للإجراءات"</li>\n" "<li>"قيود بيانات الخلفية للتطبيقات"</li>\n\n" لن تفقد أي بيانات للتطبيقات."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"إعادة تعيين التطبيقات"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"إدارة المساحة"</string>
     <string name="filter" msgid="2018011724373033887">"تصفية"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"للتبديل، اضغط على ctrl-مسافة"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"افتراضي"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"تخطيطات لوحة المفاتيح"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"قاموس المستخدم"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"قاموس شخصي"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"القواميس الشخصية"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"القاموس الشخصي"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"إضافة"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"إضافة إلى القاموس"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"تضمين خيار في قائمة الطاقة لإنشاء تقرير الأخطاء"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"البقاء في الوضع النشط"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"لا يتم مطلقًا دخول الشاشة في وضع السكون أثناء الشحن"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"تمكين سجل تطفل بواجهة وحدة تحكم المضيف عبر بلوتوث"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"التقاط حزم واجهة وحدة تحكم المضيف في ملف عبر بلوتوث"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"تحديد وقت التشغيل"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"تحديد وقت التشغيل"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"هل تريد إعادة التشغيل لتغيير وقت التشغيل من <xliff:g id="OLD">%1$s</xliff:g> إلى <xliff:g id="NEW">%2$s</xliff:g>؟"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"السماح بمواقع وهمية"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"السماح بمواقع وهمية"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"هل تريد السماح بتصحيح أخطاء USB؟"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"حماية وحدة تخزين USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"يجب على التطبيقات طلب الإذن لقراءة وحدة تخزين USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"هل تريد حماية وحدة تخزين USB؟"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"إذا كانت وحدة تخزين USB محمية، يجب على التطبيقات طلب إذن لقراءة البيانات من وحدة التخزين الخارجية."\n\n"ربما لن تعمل بعض التطبيقات إلى أن يحدثها مطورو برامجها."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"إذا كانت وحدة تخزين USB محمية، يجب على التطبيقات طلب إذن لقراءة البيانات من وحدة التخزين الخارجية.\n\nربما لن تعمل بعض التطبيقات إلى أن يحدثها مطورو برامجها."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"حماية بطاقة SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"يجب على التطبيقات طلب الإذن لقراءة بطاقة SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"هل تريد حماية بطاقة SD؟"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"إذا كانت بطاقة SD محمية، يجب على التطبيقات طلب إذن لقراءة البيانات من وحدة التخزين الخارجية."\n\n"ربما لن تعمل بعض التطبيقات إلى أن يحدثها مطورو برامجها."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"إذا كانت بطاقة SD محمية، يجب على التطبيقات طلب إذن لقراءة البيانات من وحدة التخزين الخارجية.\n\nربما لن تعمل بعض التطبيقات إلى أن يحدثها مطورو برامجها."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"تطبيق طرفي محلي"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"تمكين تطبيق طرفي يوفر إمكانية الدخول إلى واجهة النظام المحلية"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"اختيار أداة"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"اختيار أداة"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"هل تريد إنشاء الأداة والسماح بالوصول؟"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"الخدمات"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"النظام"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"إيماءات التكبير"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"عند تشغيل هذه الميزة، يمكنك التكبير والتصغير بالنقر نقرًا ثلاثيًا على الشاشة."\n\n"أثناء التكبير، يمكنك إجراء التالي:"\n<ul><li>"التدوير: اسحب إصبعين أو أكثر على الشاشة."</li>\n<li>"ضبط مستوى التكبير/التصغير: اضغط بإصبعين أو أكثر معًا أو باعد بينهم."</li></ul>\n\n"كما يمكنك أيضًا التكبير المؤقت لما يقع تحت إصبعك بالنقر نقرًا ثلاثيًا مع الاستمرار. في حالة التكبير هذه، يمكنك سحب إصبعك لاستكشاف الأجزاء المختلفة من الشاشة. ارفع إصبعك للعودة إلى الحالة السابقة."\n\n"ملاحظة: يعمل النقر نقرًا ثلاثيًا للتكبير في أي مكان ماعدا لوحة المفاتيح وشريط التنقل."</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_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>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"يقدم TalkBack تعليقات منطوقة لمساعدة المستخدمين من المكفوفين وضعاف البصر. هل تريد تثبيته مجانًا من Android Market؟"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"لم يتم تقديم أي وصف."</string>
     <string name="settings_button" msgid="3006713718908152930">"الإعدادات"</string>
+    <string name="print_settings" msgid="4742428530112487843">"الطباعة"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"إعدادات الطباعة"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"الخدمات"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"هل تريد استخدام <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"يمكن أن تستلم <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> مستندات تطبعها. قد تحتوي هذه المستندات على بيانات مهمة."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"لم يتم تثبيت أية خدمات"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"الإعدادات"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"إضافة طابعات"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"تشغيل"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"إيقاف"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"البطارية"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"ما الذي كان يستخدم البطارية"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"بيانات استخدام البطارية غير متاحة."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi يعمل"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"الجهاز اللوحي"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"الهاتف"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"تم إرسال البيانات"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"البيانات المستلمة"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"تم إرسال بيانات الجوّال"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"تم تلقى بيانات الجوّال"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"تم إرسال بيانات Wi‑Fi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"تم تلقي بيانات Wi‑Fi"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"الصوت"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"فيديو"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"وقت التشغيل"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"درجة الصوت"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"يؤثر في نبرة النص المنطوق"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"اللغة"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"اللغة غير محددة"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"تعيين الصوت الخاص بلغة النص المنطوق"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"الاستماع إلى مثال"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"تشغيل عرض توضيحي قصير لتجميع الكلام"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP غير معتمد."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"لا يمكنك تهيئة اتصال EAP Wi-Fi أثناء الإعداد. بعد الإعداد، يمكنك إجراء ذلك من الإعدادات &gt; اللاسلكي والشبكات."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"يمكن أن يستغرق الاتصال بضع دقائق..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"المس "<b>"التالي"</b>" لمتابعة الإعداد."\n\n"المس "<b>"رجوع"</b>" للاتصال بشبكة Wi‑Fi مختلفة."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"المس "<b>"التالي"</b>" لمتابعة الإعداد.\n\nالمس "<b>"رجوع"</b>" للاتصال بشبكة Wi‑Fi مختلفة."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"تم تمكين المزامنة"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"تم تعطيل المزامنة"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"خطأ في المزامنة"</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"التقويم"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"جهات الاتصال"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"مرحبًا بك في مزامنة Google!"</font>" "\n"وهي الطريقة التي تتبعها Google لمزامنة البيانات للسماح بالدخول إلى جهات الاتصال والمواعيد والمزيد من أي مكان تتواجد فيه."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"مرحبًا بك في مزامنة Google!"</font>" \nوهي الطريقة التي تتبعها Google لمزامنة البيانات للسماح بالدخول إلى جهات الاتصال والمواعيد والمزيد من أي مكان تتواجد فيه."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"إعدادات مزامنة التطبيق"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"البيانات والمزامنة"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"تغيير كلمة المرور"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"تصحيح تجاوز حد وحدة معالجة الرسومات"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"تعطيل تراكبات الأجهزة"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"استخدام وحدة معالجة الرسومات دائمًا لتركيب الشاشة"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"تمكين عمليات تتبع OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"تعطيل بيانات الخلفية في شبكات الجوال فقط. سيتم استخدام شبكة بخلاف شبكة الجوال إن كانت متاحة."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"لتقييد بيانات الخلفية لهذا التطبيق، فعين أولاً حدًا لبيانات الجوال."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"هل تريد تقييد بيانات الخلفية؟"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"قد تتسبب هذه الميزة في توقف تطبيق يعتمد على بيانات الخلفية عن العمل عند توفر شبكات جوال فقط."\n\n"يمكنك العثور على المزيد من عناصر التحكم المناسبة في استخدام البيانات من خلال الإعدادات المتوفرة داخل التطبيق."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"قد تتسبب هذه الميزة في توقف تطبيق يعتمد على بيانات الخلفية عن العمل عند توفر شبكات جوال فقط.\n\nيمكنك العثور على المزيد من عناصر التحكم المناسبة في استخدام البيانات من خلال الإعدادات المتوفرة داخل التطبيق."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"تقييد بيانات الخلفية ممكن فقط إذا عينت حدًا لبيانات الجوال."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"تشغيل مزامنة البيانات تلقائيًا؟"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"سيتم نسخ أية تغييرات تجريها على حساباتك على الويب تلقائيًا إلى جهازك اللوحي."\n\n"ويمكن أن تنسخ بعض الحسابات أيضًا أية تغييرات تجريها على الجهاز اللوحي تلقائيًا إلى الويب. يعمل حساب Google بهذه الطريقة."\n\n"لاختيار أنواع المعلومات المراد مزامنتها داخل كل حساب، انتقل إلى الإعدادات &gt; الحسابات."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"سيتم نسخ أية تغييرات تجريها على حساباتك على الويب تلقائيًا إلى هاتفك."\n\n"ويمكن أن تنسخ بعض الحسابات أيضًا أية تغييرات تجريها على الهاتف تلقائيًا إلى الويب. يعمل حساب Google بهذه الطريقة."\n\n"لاختيار أنواع المعلومات المراد مزامنتها داخل كل حساب، انتقل إلى الإعدادات &gt; الحسابات."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"سيتم نسخ أية تغييرات تجريها على حساباتك على الويب تلقائيًا إلى جهازك اللوحي.\n\nويمكن أن تنسخ بعض الحسابات أيضًا أية تغييرات تجريها على الجهاز اللوحي تلقائيًا إلى الويب. يعمل حساب Google بهذه الطريقة.\n\nلاختيار أنواع المعلومات المراد مزامنتها داخل كل حساب، انتقل إلى الإعدادات &gt; الحسابات."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"سيتم نسخ أية تغييرات تجريها على حساباتك على الويب تلقائيًا إلى هاتفك.\n\nويمكن أن تنسخ بعض الحسابات أيضًا أية تغييرات تجريها على الهاتف تلقائيًا إلى الويب. يعمل حساب Google بهذه الطريقة.\n\nلاختيار أنواع المعلومات المراد مزامنتها داخل كل حساب، انتقل إلى الإعدادات &gt; الحسابات."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"إيقاف مزامنة البيانات تلقائيًا؟"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"سيؤدي هذا إلى الحفاظ على استخدام البيانات والبطارية، ولكنك ستحتاج إلى مزامنة كل حساب يدويًا لجمع المعلومات الحديثة. ولن تتلقى إشعارات عند حدوث التحديثات."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"تاريخ إعادة تعيين دورة الاستخدام"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"تعيين تحذير استخدام البيانات"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"تعيين حد استخدام البيانات"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"وضع حد لاستخدام البيانات"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"سيتم تعطيل اتصال بيانات الجوال عند الوصول إلى الحد المحدد."\n\n"نظرًا لأنه يتم حساب استخدام البيانات بواسطة جهازك اللوحي، وقد يحسب مشغل شبكة الجوال الاستخدام بشكل مختلف، يمكنك استخدام حد معتدل."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"سيتم تعطيل اتصال بيانات الجوال عند الوصول إلى الحد المحدد."\n\n"نظرًا لأنه يتم حساب استخدام البيانات بواسطة الهاتف، وقد يحسب مشغل شبكة الجوال الاستخدام بشكل مختلف، يمكنك استخدام حد معتدل."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"سيتم تعطيل اتصال بيانات الجوال عند الوصول إلى الحد المحدد.\n\nنظرًا لأنه يتم حساب استخدام البيانات بواسطة جهازك اللوحي، وقد يحسب مشغل شبكة الجوال الاستخدام بشكل مختلف، يمكنك استخدام حد معتدل."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"سيتم تعطيل اتصال بيانات الجوال عند الوصول إلى الحد المحدد.\n\nنظرًا لأنه يتم حساب استخدام البيانات بواسطة الهاتف، وقد يحسب مشغل شبكة الجوال الاستخدام بشكل مختلف، يمكنك استخدام حد معتدل."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"هل تريد تقييد بيانات الخلفية؟"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"في حالة تقييد بيانات الجوّال للخلفية، لن تعمل بعض التطبيقات والخدمات ما لم تكن متصلاً بشبكة Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"في حالة تقييد بيانات الجوّال للخلفية، لن تعمل بعض التطبيقات والخدمات ما لم تكن متصلاً بشبكة Wi-Fi."\n\n"يؤثر هذا الإعداد على جميع مستخدمي هذا الجهاز اللوحي."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"في حالة تقييد بيانات الجوّال للخلفية، لن تعمل بعض التطبيقات والخدمات ما لم تكن متصلاً بشبكة Wi-Fi."\n\n"يؤثر هذا الإعداد على جميع مستخدمي هذا الهاتف."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"في حالة تقييد بيانات الجوّال للخلفية، لن تعمل بعض التطبيقات والخدمات ما لم تكن متصلاً بشبكة Wi-Fi.\n\nيؤثر هذا الإعداد على جميع مستخدمي هذا الجهاز اللوحي."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"في حالة تقييد بيانات الجوّال للخلفية، لن تعمل بعض التطبيقات والخدمات ما لم تكن متصلاً بشبكة Wi-Fi.\n\nيؤثر هذا الإعداد على جميع مستخدمي هذا الهاتف."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"تحذير"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"الحد"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"التطبيقات المزالة"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"المستخدم"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"ملف شخصي محظور"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"إضافة مستخدم جديد"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"يمكنك مشاركة هذا الجهاز مع أشخاص آخرين من خلال إنشاء مستخدمين إضافيين. ويكون لكل مستخدم مساحته التي يمكنه تخصيصها باستخدام تطبيقاته وخلفياته وما إلى ذلك. ويمكن للمستخدمين أيضًا ضبط إعدادات الجهاز اللوحي مثل Wi-Fi والتي تؤثر على إعدادات الجميع."\n\n"بعد إنشاء مستخدم جديد، يلزم هذا الشخص المرور بعملية الإعداد."\n\n"ويمكن لأي مستخدم قبول أذونات التطبيقات المحدّثة نيابة عن جميع المستخدمين الآخرين."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"بعد إنشاء مستخدم جديد، يلزم هذا الشخص المرور بعملية الإعداد."\n\n"يمكن لأي مستخدم قبول أذونات التطبيقات المحدثة نيابة عن جميع المستخدمين الآخرين."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"يمكنك مشاركة هذا الجهاز مع أشخاص آخرين من خلال إنشاء مستخدمين إضافيين. ويكون لكل مستخدم مساحته التي يمكنه تخصيصها باستخدام تطبيقاته وخلفياته وما إلى ذلك. ويمكن للمستخدمين أيضًا ضبط إعدادات الجهاز اللوحي مثل Wi-Fi والتي تؤثر على إعدادات الجميع.\n\nبعد إنشاء مستخدم جديد، يلزم هذا الشخص المرور بعملية الإعداد.\n\nويمكن لأي مستخدم قبول أذونات التطبيقات المحدّثة نيابة عن جميع المستخدمين الآخرين."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"بعد إنشاء مستخدم جديد، يلزم هذا الشخص المرور بعملية الإعداد.\n\nيمكن لأي مستخدم قبول أذونات التطبيقات المحدثة نيابة عن جميع المستخدمين الآخرين."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"هل تريد إعداد المستخدم الآن؟"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"تأكد من أن الشخص متاح لأخذ الجهاز اللوحي وإعداد مساحته."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"هل ترغب في إعداد ملف شخصي الآن؟"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"يؤثر هذا الإعداد على جميع مستخدمي هذا الهاتف."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"تغيير اللغة"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"تغيير حجم الخط"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"القيود"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"إزالة القيود"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"تغيير رقم التعريف الشخصي"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"إظهار الإشعارات"</string>
     <string name="help_label" msgid="1107174367904110532">"مساعدة"</string>
     <string name="user_account_title" msgid="1127193807312271167">"حساب المحتوى"</string>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index b4fbef25b29..86713752538 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -233,79 +233,22 @@
     <item msgid="6358963769537892925">"Месцазнаходжанне"</item>
     <item msgid="255608127647030286">"Персанальны"</item>
     <item msgid="4588829735729884491">"Абмен паведамленнямі"</item>
-    <item msgid="8971765125227378270">"Прылада"</item>
-  </string-array>
-  <string-array name="app_ops_summaries">
-    <item msgid="4979188868761515915">"прыблiзнае месцазнаходжанне"</item>
-    <item msgid="5789673140227507995">"дакладнае месцазнаходжанне"</item>
-    <item msgid="1061584358377390581">"GPS"</item>
-    <item msgid="5387405117297558954">"вібрацыя"</item>
-    <item msgid="3434165993711230924">"чытанне кантактаў"</item>
-    <item msgid="616161687718081936">"змяніць кантакты"</item>
-    <item msgid="7638002295329050091">"чытанне гiсторыi выклікаў"</item>
-    <item msgid="6546959730920410907">"змены ў гiсторыi выклікаў"</item>
-    <item msgid="446877710771379667">"чытанне календара"</item>
-    <item msgid="7674458294386319722">"змяніць каляндар"</item>
-    <item msgid="8281201165558093009">"сканаванне Wi-Fi"</item>
-    <item msgid="8694611243479480497">"апавяшчэнне"</item>
-    <item msgid="7776439107987345446">"сканаванне па сотавым"</item>
-    <item msgid="514615766544675057">"патэлефанаваць па нумары"</item>
-    <item msgid="8181415497109310680">"чытаць SMS"</item>
-    <item msgid="6816551144382117307">"напісаць SMS"</item>
-    <item msgid="4600463921908905030">"атрымліваць SMS"</item>
-    <item msgid="5958926493289432745">"атрымліваць экстранныя SMS"</item>
-    <item msgid="4945269495221089540">"атрымліваць MMS"</item>
-    <item msgid="5570472453573929087">"атрымаць WAP Push"</item>
-    <item msgid="7125408150230860501">"Адправiць SMS"</item>
-    <item msgid="7080337936612188061">"чытанне ICC SMS"</item>
-    <item msgid="587124103118495063">"напiсаць ICC SMS"</item>
-    <item msgid="2320577158869025503">"змяніць налады"</item>
-    <item msgid="1545733463471924009">"намалюйце ўверсе"</item>
-    <item msgid="3609046903962454582">"доступ да паведамленняў"</item>
-    <item msgid="4671646036128214513">"камера"</item>
-    <item msgid="1097324338692486211">"запісваць аўдыё"</item>
-    <item msgid="5031552983987798163">"прайграць аўдыё"</item>
-    <item msgid="8374996688066472414">"счытаць буфер абмену"</item>
-    <item msgid="3045529469061083747">"змяніць буфер абмену"</item>
-  </string-array>
-  <string-array name="app_ops_labels">
-    <item msgid="6602854600289714121">"Месцазнаходжанне"</item>
-    <item msgid="8677040780775113033">"Месцазнаходжанне"</item>
-    <item msgid="1660743989948992916">"Месцазнаходжанне"</item>
-    <item msgid="8791172739860195290">"Вібрацыя"</item>
-    <item msgid="383413555642128046">"Чытанне кантактаў"</item>
-    <item msgid="3654594895269697313">"Змяніць кантакты"</item>
-    <item msgid="7928393476362362538">"Чытанне гiсторыi выклікаў"</item>
-    <item msgid="6248591205254641116">"Змяненне запісаў у гiсторыi выклікаў"</item>
-    <item msgid="6093344633066170692">"Чытанне календара"</item>
-    <item msgid="1334886368750347692">"Змена календара"</item>
-    <item msgid="1638204101698708656">"Месцазнаходжанне"</item>
-    <item msgid="2154671955760380322">"Апублiкаваць апавяшчэнне"</item>
-    <item msgid="4282477730595931828">"Месцазнаходжанне"</item>
-    <item msgid="4891423912898525905">"Патэлефанаваць па нумары"</item>
-    <item msgid="626463821668200388">"Прыём SMS/MMS"</item>
-    <item msgid="1237538540368797101">"Адправiць SMS/MMS"</item>
-    <item msgid="3986142739951490025">"Прыём SMS/MMS"</item>
-    <item msgid="3984213795861739778">"Прыём SMS/MMS"</item>
-    <item msgid="3656243523752472788">"Прыём SMS/MMS"</item>
-    <item msgid="8105802370238551510">"Прыём SMS/MMS"</item>
-    <item msgid="1407766984645388488">"Адправiць SMS/MMS"</item>
-    <item msgid="1530132603376027248">"Прыём SMS/MMS"</item>
-    <item msgid="1188256962149204607">"Адправiць SMS/MMS"</item>
-    <item msgid="4218544235221631789">"Змена налад"</item>
-    <item msgid="736541391767350377">"Намалюйце ўверсе"</item>
-    <item msgid="5530815681721654194">"Доступ да паведамленняў"</item>
-    <item msgid="781213371706962767">"Камера"</item>
-    <item msgid="1720492593061838172">"Запісаць аўдыё"</item>
-    <item msgid="3493046322001257041">"Прайграванне аўдыё"</item>
-    <item msgid="136815868796597058">"Счытаць буфер абмену"</item>
-    <item msgid="5238692940326972503">"Змяніць буфер абмену"</item>
+    <item msgid="886742181977884584">"Медыя"</item>
+    <item msgid="7924928667052300589">"Прылада"</item>
   </string-array>
+    <!-- no translation found for app_ops_summaries:41 (26109888160231211) -->
+    <!-- no translation found for app_ops_labels:41 (8584357129746649222) -->
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кароткі"</item>
     <item msgid="2560532955514699713">"Сярэдні"</item>
     <item msgid="2372711992605524591">"Доўгі"</item>
   </string-array>
+    <!-- no translation found for select_runtime_titles:0 (3574453009229338122) -->
+    <!-- no translation found for select_runtime_titles:1 (8978402910750533864) -->
+    <!-- no translation found for select_runtime_titles:2 (7839859333977894115) -->
+    <!-- no translation found for select_runtime_summaries:0 (6412880178297884701) -->
+    <!-- no translation found for select_runtime_summaries:1 (5131846588686178907) -->
+    <!-- no translation found for select_runtime_summaries:2 (4530003713865319928) -->
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Ніколі не правяраць"</item>
     <item msgid="6042769699089883931">"Праверка толькi для змесціва, абароненага DRM"</item>
@@ -367,6 +310,11 @@
     <item msgid="8272260411216018353">"На экране ў выглядзе ліній"</item>
     <item msgid="120512413928262547">"У абалонцы adb dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Адключаны"</item>
+    <item msgid="7688197031296835369">"Паказаць вобласці з перабольшваннем"</item>
+    <item msgid="8332661909019981149">"Паказаць лічыльнік перабольшвання"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартны ліміт"</item>
     <item msgid="4071574792028999443">"Няма фонавых працэсаў"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 0399ab6e5df..e38d0ff7fff 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -275,8 +275,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_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>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Патрабаваць лічбавы PIN-код або пароль для расшыфроўкі планшэта пры кожным уключэнні"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Патрабаваць лічбавы PIN-код або пароль для расшыфроўкі тэлефона пры кожным уключэнні"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Зашыфраваны"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Вы можаце зашыфраваць свае ўліковыя запісы, налады, спампаваныя прыкладанні і іх дадзеныя, мультымедыйныя і іншыя файлы. Пасля зашыфроўкі планшэта кожны раз пры ўключэнні трэба будзе ўводзіць лічбавы PIN-код ці пароль для яго расшыфроўкі. Вы не зможаце расшыфраваць планшэт, акрамя як скінуўшы налады дадзеных, пасля чаго выдаляцца ўсе дадзеныя."\n\n"Шыфраванне займае гадзіну ці больш. Трэба пачынаць з зараджаным акумулятарам і трымаць планшэт падлучаным да завяршэння шыфравання. Калі перапыніць працэс шыфравання, будуць страчаны ўсе або некаторыя вашы дадзеныя."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Вы можаце зашыфраваць свае ўліковыя запісы, налады, спампаваныя прыкладанні і іх дадзеныя, мультымедыйныя і іншыя файлы. Пасля зашыфроўкі тэлефона кожны раз пры ўключэнні трэба будзе ўводзіць лічбавы PIN-код ці пароль для яго расшыфроўкі. Вы не зможаце расшыфраваць тэлефон, акрамя як скінуўшы налады дадзеных, пасля чаго выдаляцца ўсе дадзеныя."\n\n"Шыфраванне займае гадзіну ці больш. Трэба пачынаць з зараджаным акумулятарам і трымаць тэлефон падлучаным да завяршэння шыфравання. Калі перапыніць працэс шыфравання, будуць страчаны ўсе або некаторыя вашы дадзеныя."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Вы можаце зашыфраваць свае ўліковыя запісы, налады, спампаваныя прыкладанні і іх дадзеныя, мультымедыйныя і іншыя файлы. Пасля зашыфроўкі планшэта кожны раз пры ўключэнні трэба будзе ўводзіць лічбавы PIN-код ці пароль для яго расшыфроўкі. Вы не зможаце расшыфраваць планшэт, акрамя як скінуўшы налады дадзеных, пасля чаго выдаляцца ўсе дадзеныя.\n\nШыфраванне займае гадзіну ці больш. Трэба пачынаць з зараджаным акумулятарам і трымаць планшэт падлучаным да завяршэння шыфравання. Калі перапыніць працэс шыфравання, будуць страчаны ўсе або некаторыя вашы дадзеныя."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Вы можаце зашыфраваць свае ўліковыя запісы, налады, спампаваныя прыкладанні і іх дадзеныя, мультымедыйныя і іншыя файлы. Пасля зашыфроўкі тэлефона кожны раз пры ўключэнні трэба будзе ўводзіць лічбавы PIN-код ці пароль для яго расшыфроўкі. Вы не зможаце расшыфраваць тэлефон, акрамя як скінуўшы налады дадзеных, пасля чаго выдаляцца ўсе дадзеныя.\n\nШыфраванне займае гадзіну ці больш. Трэба пачынаць з зараджаным акумулятарам і трымаць тэлефон падлучаным да завяршэння шыфравання. Калі перапыніць працэс шыфравання, будуць страчаны ўсе або некаторыя вашы дадзеныя."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Шыфраваць планшэт"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Шыфраванне тэлефона"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Неабходна зарадзіць акумулятар і паўтарыць спробу."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Паўтарыце спробу праз <xliff:g id="DELAY">^1</xliff:g> с."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Увядзіце пароль"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шыфраванне няўдалае"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шыфраванне было перапынена і не можа быць завершана. У выніку гэтага дадзеныя на вашым планшэце больш не даступныя."\n\n"Каб выкарыстоўваць планшэт далей, неабходна выканаць скід налад. Пры наладзе планшэта пасля перазагрузкі вы будзеце мець магчымасць аднавіць любыя дадзеныя, якія былі скапіяваны ў ваш уліковы запіс Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шыфраванне перапынена і не можа быць завершана. У выніку дадзеныя на вашым тэлефоне больш не даступныя."\n\n"Каб выкарыстоўваць тэлефон далей, неабходна выканаць скід налад. Пры наладзе тэлефона пасля перазагрузкі вы будзеце мець магчымасць аднавіць любыя дадзеныя, якія былі скапіяваныя ў ваш уліковы запіс Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шыфраванне было перапынена і не можа быць завершана. У выніку гэтага дадзеныя на вашым планшэце больш не даступныя.\n\nКаб выкарыстоўваць планшэт далей, неабходна выканаць скід налад. Пры наладзе планшэта пасля перазагрузкі вы будзеце мець магчымасць аднавіць любыя дадзеныя, якія былі скапіяваны ў ваш уліковы запіс Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шыфраванне перапынена і не можа быць завершана. У выніку дадзеныя на вашым тэлефоне больш не даступныя.\n\nКаб выкарыстоўваць тэлефон далей, неабходна выканаць скід налад. Пры наладзе тэлефона пасля перазагрузкі вы будзеце мець магчымасць аднавіць любыя дадзеныя, якія былі скапіяваныя ў ваш уліковы запіс Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Пераключэнне рэжыму ўводу"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Выберыце спосаб блак. экрана"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Блакав. рэз. капіяв."</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Падключэнне"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Падключана"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Даступна"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Выкарыстоўваецца"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Налады экрана"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Адключыцца?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Будзе завершана вашай сувящь з прыладай :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,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 прылады, утрымліваючы прылады блізка адна да адной. Напрыклад, вы можаце перадаваць старонкi з браўзэра, відэа з YouTube, кантакты і многае іншае."\n\n"Толькі злучыце прылады (звычайна заднімі бакамі) і дакраніцеся да экрана. Прыкладанне вызначыць, якая прылада падлучаецца."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Калі гэтая функцыя ўключаная, вы можаце перадаваць змесціва прыкладання на іншыя сумяшчальныя з NFC прылады, утрымліваючы прылады блізка адна да адной. Напрыклад, вы можаце перадаваць старонкi з браўзэра, відэа з YouTube, кантакты і многае іншае.\n\nТолькі злучыце прылады (звычайна заднімі бакамі) і дакраніцеся да экрана. Прыкладанне вызначыць, якая прылада падлучаецца."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Выяўленне сеткавых службаў"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Дазволіць прыкладанням з іншых прылад знаходзіць прыкладанні на гэтай прыладзе"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Абаронены з дапамогай <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", абароненых з дапамогай <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Няма"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Каб павысіць дакладнасць размяшчэння і для іншых мэтаў, <xliff:g id="APP_NAME">%1$s</xliff:g> хоча ўключыць сеткавае сканаванне, нават калі Wi-Fi выключаны."\n\n"Дазволіць для ўсіх прыкладанняў, якія патрабуецца адсканаваць?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Каб павысіць дакладнасць размяшчэння і для іншых мэтаў, <xliff:g id="APP_NAME">%1$s</xliff:g> хоча ўключыць сеткавае сканаванне, нават калі Wi-Fi выключаны.\n\nДазволіць для ўсіх прыкладанняў, якія патрабуецца адсканаваць?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дазволіць"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Адхiлiць"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Падлучыцца"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"УВАГА: ваш аператар можа патрабаваць дадатковую аплату за перадачу дадзеных.\n\n Наладка планшэта можа запатрабаваць значнай сеткавай актыўнасці."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"УВАГА: ваш аператар можа патрабаваць дадатковую аплату за перадачу дадзеных.\n\n Наладка тэлефона можа запатрабаваць значнай сеткавай актыўнасці."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"УВАГА: Пакуль у вас няма падключэння да Iнтэрнэту, планшэт не зможа праверыць, цi абноўлена праграмнае забеспячэнне."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"УВАГА: Пакуль у вас няма падключэння да Iнтэрнэту, тэлефон не зможа праверыць, цi абноўлена праграмнае забеспячэнне."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Планшэт не змог падключыцца да гэтай сеткі Wi-Fi."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN-код SIM-карты"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Няправільны PIN-код"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN-код не супадае"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Немагчыма змяніць PIN-код."\n"Магчыма, няправільны PIN-код."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Немагчыма змяніць PIN-код.\nМагчыма, няправільны PIN-код."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN-код SIM-карты паспяхова зменены"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Немагчыма змяніць стан блакавання SIM-карты."\n"Магчыма, няправільны PIN-код."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Немагчыма змяніць стан блакавання SIM-карты.\nМагчыма, няправільны PIN-код."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"ОК"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Адмяніць"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Стан планшэта"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Скід да завадскіх налад"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Сцірае ўсе дадзеныя з планшэта"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Сцірае ўсе дадзеныя на тэлефоне"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Гэта дазволіць сцерці ўсе дадзеныя з "<b>"унутранага сховiшча вашага планшэта"</b>" , у тым ліку: "\n\n<li>"ваш улiковы запiс Google"</li>\n<li>"сістэмныя дадзеныя, а таксама дадзеныя прыкладанняў і налады"</li>\n<li>"спампаваныя прыкладанні"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Гэта дазволіць сцерці ўсе дадзеныя з "<b>"унутранага сховiшча вашага тэлефона"</b>" , у тым ліку: "\n\n<li>"ваш улiковы запiс Google"</li>\n<li>"сістэмныя дадзеныя, а таксама дадзеныя прыкладанняў і налады"</li>\n<li>"спампаваныя прыкладанні"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"У дадзены момант вы зайшлі ў наступныя ўліковыя запісы:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Гэта дазволіць сцерці ўсе дадзеныя з "<b>"унутранага сховiшча вашага планшэта"</b>" , у тым ліку: \n\n"<li>"ваш улiковы запiс Google"</li>\n<li>"сістэмныя дадзеныя, а таксама дадзеныя прыкладанняў і налады"</li>\n<li>"спампаваныя прыкладанні"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Гэта дазволіць сцерці ўсе дадзеныя з "<b>"унутранага сховiшча вашага тэлефона"</b>" , у тым ліку: \n\n"<li>"ваш улiковы запiс Google"</li>\n<li>"сістэмныя дадзеныя, а таксама дадзеныя прыкладанняў і налады"</li>\n<li>"спампаваныя прыкладанні"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"У дадзены момант вы зайшлі ў наступныя ўліковыя запісы:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музыка"</li>\n<li>"Фатаграфіі"</li>\n<li>"Іншыя дадзеныя карыстальніка"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Каб выдаліць музыку, фатаграфіі і іншыя дадзеныя карыстальніка, трэба ачысціць "<b>"USB-назапашвальнік"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Каб выдаліць музыку, фатаграфіі і іншыя дадзеныя карыстальніка, трэба выдаліць інфармацыю з "<b>"SD-карты"</b>"."</string>
@@ -1110,7 +1111,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Паказаць кэшаваныя працэсы"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Скід налад прыкладання"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Скінуць налады прыкладання?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Гэта дазволіць скінуць усе налады для:"\n\n<li>"адключаных прыкладанняў"</li>\n<li>"адключаных паведамленняў прыкладанняў"</li>\n<li>"прыкладанняў па змаўчанні для дзеянняў"</li>\n<li>"абмежаванняў фонавых дадзеных для прыкладанняў"</li>\n\n"Вы не страціце дадзеныя прыкладанняў."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Гэта дазволіць скінуць усе налады для:\n\n"<li>"адключаных прыкладанняў"</li>\n<li>"адключаных паведамленняў прыкладанняў"</li>\n<li>"прыкладанняў па змаўчанні для дзеянняў"</li>\n<li>"абмежаванняў фонавых дадзеных для прыкладанняў"</li>\n\n"Вы не страціце дадзеныя прыкладанняў."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Скід прыкладанняў"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Кіраванне вольным месцам"</string>
     <string name="filter" msgid="2018011724373033887">"Фільтр"</string>
@@ -1245,9 +1246,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Каб перакл., націсніце Ctrl-Space"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Па змаўчанні"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Раскладкі клавіятуры"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Карыстальніцкі слоўнік"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Асабісты слоўнік"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Асабістыя слоўнікі"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Персанальны слоўнік"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Дадаць"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Дадаць у слоўнік"</string>
@@ -1308,6 +1307,16 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Уключыце параметр у меню сiлкавання, каб прыняць справаздачу пра памылку"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Прадухіляць ад пераходу ў рэжым сну"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Экран ніколі не ўвайдзе ў рэжым сну падчас зарадкі"</string>
+    <!-- no translation found for bt_hci_snoop_log (3340699311158865670) -->
+    <skip />
+    <!-- no translation found for bt_hci_snoop_log_summary (730247028210113851) -->
+    <skip />
+    <!-- no translation found for select_runtime_title (649783802363155346) -->
+    <skip />
+    <!-- no translation found for select_runtime_dialog_title (5314872813037493958) -->
+    <skip />
+    <!-- no translation found for select_runtime_warning_message (1937574953265648165) -->
+    <skip />
     <string name="allow_mock_location" msgid="2787962564578664888">"Дазволіць несапраўдныя месцы"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Дазволіць несапраўдныя месцы"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Дазволіць адладку USB?"</string>
@@ -1320,11 +1329,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Абараніць USB-назапашвальнік"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Прыкладанні павінны запытваць дазвол на чытанне USB-назапашвальніка"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Абараніць USB-назапашвальнік?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Калі USB-назапашвальнік абаронены, прыкладанні павінны запытваць дазвол на чытанне дадзеных са знешняй памяці."\n\n"Некаторыя прыкладанні могуць не працаваць, пакуль не будуць абноўлены распрацоўшчыкамі."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Калі USB-назапашвальнік абаронены, прыкладанні павінны запытваць дазвол на чытанне дадзеных са знешняй памяці.\n\nНекаторыя прыкладанні могуць не працаваць, пакуль не будуць абноўлены распрацоўшчыкамі."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Абараніць SD-карту"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Прыкладанні павінны запытваць дазвол на чытанне SD-карты"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Абараніць SD-карту?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Калі SD-карта абаронена, прыкладанні павінны запытваць дазвол на чытанне дадзеных са знешняй памяці."\n\n"Некаторыя прыкладанні могуць не працаваць, пакуль не будуць абноўлены распрацоўшчыкамі."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Калі SD-карта абаронена, прыкладанні павінны запытваць дазвол на чытанне дадзеных са знешняй памяці.\n\nНекаторыя прыкладанні могуць не працаваць, пакуль не будуць абноўлены распрацоўшчыкамі."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Лакальны тэрмінал"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Уключэнне прыкладання тэрмінала, якое прапануе доступ да лакальнай абалонкі"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Выберыце гаджэт"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Выберыце віджэт"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Стварыць віджэт і дазволіць доступ?"</string>
@@ -1345,11 +1356,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Службы"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Сістэма"</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_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_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>
@@ -1371,6 +1382,26 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Прыкладанне TalkBack забяспечвае вусную зваротную сувязь, каб дапамагаць сляпым карыстальнікам і карыстальнікам з дрэнным зрокам. Усталяваць яго бясплатна з Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Няма апісання."</string>
     <string name="settings_button" msgid="3006713718908152930">"Налады"</string>
+    <!-- no translation found for print_settings (4742428530112487843) -->
+    <skip />
+    <!-- no translation found for print_settings_title (4911263339115736689) -->
+    <skip />
+    <!-- no translation found for print_services_title (1088097751249445946) -->
+    <skip />
+    <!-- no translation found for print_service_security_warning_title (2338435517408144841) -->
+    <skip />
+    <!-- no translation found for print_service_security_warning_summary (919299459931111450) -->
+    <skip />
+    <!-- no translation found for print_no_services_installed (8443039625463872294) -->
+    <skip />
+    <!-- no translation found for print_menu_item_settings (6591330373682227082) -->
+    <skip />
+    <!-- no translation found for print_menu_item_add_printers (2890738028215834012) -->
+    <skip />
+    <!-- no translation found for print_feature_state_on (8098901852502441048) -->
+    <skip />
+    <!-- no translation found for print_feature_state_off (7294876968403966040) -->
+    <skip />
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Батарэя"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"На што расходуецца акумулятар"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Адсутнiчаюць дадзеныя пра выкарыстанне акумулятара."</string>
@@ -1410,8 +1441,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi працуе"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Планшэт"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Тэлефон"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Пераданыя дадзеныя"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Атрыманыя дадзеныя"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Мабільныя дадзеныя адпраўлены"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Атрыманы мабільныя дадзеныя"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Дадзеныя ў сетцы Wi-Fi адпраўлены"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Атрыманы дадзеныя ў сетцы Wi-Fi"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Аўдыё"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Відэа"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Час працы"</string>
@@ -1465,6 +1498,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Тон"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Уплывае на тон вуснага тэксту"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Мова"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Мова не выбрана"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Задае голас прамаўлення тэкту на канкрэтнай мове"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Паслухайце прыклад"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Прайграць кароткую дэманстрацыю сінтэзу гаворкі"</string>
@@ -1599,7 +1633,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP не падтрымліваецца."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Немагчыма наладзіць злучэнне EAP Wi-Fi падчас усталявння. Пазней вы можаце зрабіць гэта ў наладах у раздзеле \"Бесправадныя і правадныя сеткі\"."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Падлучэнне можа заняць некалькі хвілін..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Націсніце кнопку "<b>"\"Далей\""</b>", каб працягнуць усталёўку."\n\n"Націсніце кнопку "<b>"\"Назад\""</b>", каб падключыцца да іншай сеткі Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Націсніце кнопку "<b>"\"Далей\""</b>", каб працягнуць усталёўку.\n\nНацісніце кнопку "<b>"\"Назад\""</b>", каб падключыцца да іншай сеткі Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Сінхранізацыя ўкл."</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Сінхранізацыя адключаная"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Памылка сінхранізацыі"</string>
@@ -1627,7 +1661,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Каляндар"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Кантакты"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Вітаем у службе сінхранізацыі Google!"</font>" "\n"Падчас сінхранізацыі дадзеных Google дазваляе атрымліваць у любым месцы доступ да кантактаў, сустрэч і многага іншага."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Вітаем у службе сінхранізацыі Google!"</font>" \nПадчас сінхранізацыі дадзеных Google дазваляе атрымліваць у любым месцы доступ да кантактаў, сустрэч і многага іншага."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Параметры сiнхранiзацыi прыкладання"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Сынхранізацыя дадзеных"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Змяніць пароль"</string>
@@ -1681,8 +1715,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Адладка перамалёўкі GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Адкл. апаратн. накладання"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Заўсёды выкарыстоўваць GPU для экраннай кампаноўкі"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Уключэнне слядоў OpenGL"</string>
@@ -1743,11 +1776,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Адключыць фонавыя дадзеныя ў мабільных сетках. Пры наяўнасці будуць выкарыстоўвацца немабільныя сеткі."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Каб абмежаваць зыходныя дадзеныя для гэтага прыкладання, спачатку ўсталюйце ліміт мабільных дадзеных."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Абмежаваць зыходныя дадзеныя?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Гэта функцыя можа перашкаджаць працы прыкладанняў, якiя залежаць ад фонавых дадзеных, толькi калі даступныя мабільныя сеткі."\n\n"Вы можаце знайсці больш адпаведнае прымяненне дадзеным у наладах прыкладання."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Гэта функцыя можа перашкаджаць працы прыкладанняў, якiя залежаць ад фонавых дадзеных, толькi калі даступныя мабільныя сеткі.\n\nВы можаце знайсці больш адпаведнае прымяненне дадзеным у наладах прыкладання."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Абмежаваць зыходныя дадзеныя можна толькі тады, калі вы ўсталявалі ліміт мабільных дадзеных."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Уключыць аўтасінхр. дадзеных?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Любыя змены, унесеныя ва ўліковы запіс на вэб-сайце, будуць аўтаматычна скапіраваны ў памяць планшэта."\n\n"Некаторыя ўліковыя запісы таксама могуць аўтаматычна капіраваць любыя змены ў тэлефоне, якія вы робіце на вэб-сайце. Уліковы запіс Google працуе наступным чынам."\n\n"Каб выбраць, якія віды інфармацыі сінхранiзаваць у кожным уліковым запісе, перайдзіце ў меню: Налады &gt; Уліковыя запісы."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Любыя змены, унесеныя ва ўліковы запіс на вэб-сайце, будуць аўтаматычна скапіраваныя ў памяць тэлефона."\n\n"Некаторыя ўліковыя запісы таксама могуць аўтаматычна капіраваць любыя змены ў тэлефоне, якія вы робіце на вэб-сайце. Уліковы запіс Google працуе наступным чынам."\n\n"Каб выбраць, якія віды інфармацыі сінхранiзаваць у кожным уліковым запісе, перайдзіце ў меню: Налады &gt; Уліковыя запісы."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Любыя змены, унесеныя ва ўліковы запіс на вэб-сайце, будуць аўтаматычна скапіраваны ў памяць планшэта.\n\nНекаторыя ўліковыя запісы таксама могуць аўтаматычна капіраваць любыя змены ў тэлефоне, якія вы робіце на вэб-сайце. Уліковы запіс Google працуе наступным чынам.\n\nКаб выбраць, якія віды інфармацыі сінхранiзаваць у кожным уліковым запісе, перайдзіце ў меню: Налады &gt; Уліковыя запісы."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Любыя змены, унесеныя ва ўліковы запіс на вэб-сайце, будуць аўтаматычна скапіраваныя ў памяць тэлефона.\n\nНекаторыя ўліковыя запісы таксама могуць аўтаматычна капіраваць любыя змены ў тэлефоне, якія вы робіце на вэб-сайце. Уліковы запіс Google працуе наступным чынам.\n\nКаб выбраць, якія віды інфармацыі сінхранiзаваць у кожным уліковым запісе, перайдзіце ў меню: Налады &gt; Уліковыя запісы."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Адключыць аўтасінхр. дадзеных?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Гэта дасць магчымасць захаваць трафік і акумулятар, але вам трэба будзе сінхранiзаваць кожны ўліковы запіс уручную, каб збіраць свежую інфармацыю. І вы не будзеце атрымліваць апавяшчэнні, калі з\'явяцца абнаўленні."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Дата скіду цыкла выкарыстання"</string>
@@ -1756,12 +1789,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Усталяваць папярэджанне аб выкарыстанні дадзеных"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Усталяваць ліміт выкарыстання дадзеных"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Абмежаванне выкарыстання дадзеных"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Ваша падключэнне для перадачы дадзеных будзе завершана пасля дасягнення пэўнага лiмiту."\n\n"Паколькi выкарыстанне дадзеных вызначаецца вашым планшэтам i ваш аператар можа спаганяць плату iншым чынам, старайцеся прытрымлiвацца лiмiту."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Ваша падключэнне для перадачы дадзеных "\n" будзе завершана пасля дасягнення пэўнага лiмiту."\n"{2/}Паколькi выкарыстанне дадзеных вызначаецца вашым тэлефонам i ваш аператар можа спаганяць плату iншым чынам, старайцеся прытрымлiвацца лiмiту."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Ваша падключэнне для перадачы дадзеных будзе завершана пасля дасягнення пэўнага лiмiту.\n\nПаколькi выкарыстанне дадзеных вызначаецца вашым планшэтам i ваш аператар можа спаганяць плату iншым чынам, старайцеся прытрымлiвацца лiмiту."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Ваша падключэнне для перадачы дадзеных \n будзе завершана пасля дасягнення пэўнага лiмiту.\n{2/}Паколькi выкарыстанне дадзеных вызначаецца вашым тэлефонам i ваш аператар можа спаганяць плату iншым чынам, старайцеся прытрымлiвацца лiмiту."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Абмежаваць зыходныя дадзеныя?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Калі абмежаваць фонавую перадачу мабiльных дадзеных, некаторыя прыкладанні і службы не будуць працаваць пры падключэннi да сеткі Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Калі абмежаваць фонавую перадачу мабільных дадзеных, некаторыя прыкладанні і паслугі не будуць працаваць, калі вы падключаны да сеткi Wi-Fi сеткі."\n\n"Гэты параметр распаўсюджваецца на ўсіх карыстальнікаў гэтага планшэта."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Калі абмежаваць фонавую перадачу мабільных дадзеных, некаторыя прыкладанні і паслугі не будуць працаваць, калі вы падключаны да сеткi Wi-Fi сеткі."\n\n"Гэты параметр распаўсюджваецца на ўсіх карыстальнікаў гэтага тэлефона."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Калі абмежаваць фонавую перадачу мабільных дадзеных, некаторыя прыкладанні і паслугі не будуць працаваць, калі вы падключаны да сеткi Wi-Fi сеткі.\n\nГэты параметр распаўсюджваецца на ўсіх карыстальнікаў гэтага планшэта."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Калі абмежаваць фонавую перадачу мабільных дадзеных, некаторыя прыкладанні і паслугі не будуць працаваць, калі вы падключаны да сеткi Wi-Fi сеткі.\n\nГэты параметр распаўсюджваецца на ўсіх карыстальнікаў гэтага тэлефона."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g> "</font>\n<font size="12">"папярэджанне "</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ліміт"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Выдаленыя прыкладанні"</string>
@@ -1848,8 +1881,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Карыстальнік"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Абмежаваны профiль"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Дад. новага карыстальніка"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Вы можаце адкрыць доступ да гэтай прылады іншым карыстальнiкам шляхам стварэння дадатковых карыстальнікаў. Кожны карыстальнік мае свой уласны раздзел, на якім ён можа наладзіць уласныя прыкладанні, шпалеры і гэтак далей. Карыстальнікі таксама могуць наладжваць параметры планшэта, напрыклад Wi-Fi, якія ўплываюць на ўсіх."\n\n"Пасля стварэння новага карыстальніка, ён павінен прайсці праз працэс усталёўкі."\n\n"Любы карыстальнік можа прымаць абноўленыя дазволы на прыкладанне ад імён усіх іншых карыстальнікаў."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"Пасля стварэння новага карыстальніка ён павінен прайсці праз працэс усталёўкі."\n\n"Любы карыстальнік можа прымаць абноўленыя дазволы на прыкладанне ад імён усіх іншых карыстальнікаў."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Вы можаце адкрыць доступ да гэтай прылады іншым карыстальнiкам шляхам стварэння дадатковых карыстальнікаў. Кожны карыстальнік мае свой уласны раздзел, на якім ён можа наладзіць уласныя прыкладанні, шпалеры і гэтак далей. Карыстальнікі таксама могуць наладжваць параметры планшэта, напрыклад Wi-Fi, якія ўплываюць на ўсіх.\n\nПасля стварэння новага карыстальніка, ён павінен прайсці праз працэс усталёўкі.\n\nЛюбы карыстальнік можа прымаць абноўленыя дазволы на прыкладанне ад імён усіх іншых карыстальнікаў."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Пасля стварэння новага карыстальніка ён павінен прайсці праз працэс усталёўкі.\n\nЛюбы карыстальнік можа прымаць абноўленыя дазволы на прыкладанне ад імён усіх іншых карыстальнікаў."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Наладзiць карыстальнiкаў?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Пераканайцеся, што чалавек мае магчымасць узяць планшэт i паднесцi яго да твару"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Наладзiць профiль?"</string>
@@ -1880,6 +1913,12 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Гэты параметр распаўсюджвае на ўсіх карыстальнікаў гэтага тэлефона."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Змяніць мову"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Змяніць памер шрыфту"</string>
+    <!-- no translation found for restriction_settings_title (4233515503765879736) -->
+    <skip />
+    <!-- no translation found for restriction_menu_reset (2067644523489568173) -->
+    <skip />
+    <!-- no translation found for restriction_menu_change_pin (740081584044302775) -->
+    <skip />
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Паказваць паведамленні"</string>
     <string name="help_label" msgid="1107174367904110532">"Даведка"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Уліковы запіс для змесціва"</string>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 10d6f2abe35..2f75b390b50 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Местоположение"</item>
     <item msgid="255608127647030286">"Лични"</item>
     <item msgid="4588829735729884491">"Съобщения"</item>
-    <item msgid="8971765125227378270">"Устройство"</item>
+    <item msgid="886742181977884584">"Мултимедия"</item>
+    <item msgid="7924928667052300589">"Устройство"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"местоположение с ниска точност"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"възпроизвеждане на звук"</item>
     <item msgid="8374996688066472414">"четене на буферната памет"</item>
     <item msgid="3045529469061083747">"промяна на буферната памет"</item>
+    <item msgid="5124443975763747838">"бутони за мултимедия"</item>
+    <item msgid="4547883971364273343">"фокусиране на звука"</item>
+    <item msgid="2603878814882344450">"основна сила на звука"</item>
+    <item msgid="7136963238377062018">"сила на звука за глас"</item>
+    <item msgid="4270236897655923007">"сила на звука при звънене"</item>
+    <item msgid="6325739889222559394">"сила на звука за мултимедия"</item>
+    <item msgid="5762123934816216821">"сила на звука на будилника"</item>
+    <item msgid="785049718065337473">"сила на звука за известия"</item>
+    <item msgid="6700305533746877052">"сила на звука за Bluetooth"</item>
+    <item msgid="2029227495214047094">"оставяне в будно състояние"</item>
+    <item msgid="26109888160231211">"наблюдение на местоположението"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Местоположение"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Възпроизвеждане на звук"</item>
     <item msgid="136815868796597058">"Четене на буферната памет"</item>
     <item msgid="5238692940326972503">"Промяна на буферната памет"</item>
+    <item msgid="5753789168376302997">"Бутони за мултимедия"</item>
+    <item msgid="3265262911688671938">"Фокусиране на звука"</item>
+    <item msgid="2098976479485046797">"Основна сила на звука"</item>
+    <item msgid="5660213838861789350">"Сила на звука за глас"</item>
+    <item msgid="7983336752371254444">"Сила на звука при звънене"</item>
+    <item msgid="7878027809189330917">"Сила на звука за мултимедия"</item>
+    <item msgid="7260546305036218513">"Сила на звука на будилника"</item>
+    <item msgid="9103719301075748925">"Сила на звука при известие"</item>
+    <item msgid="7025966722295861512">"Сила на звука за Bluetooth"</item>
+    <item msgid="4665183401128289653">"Оставяне в будно състояние"</item>
+    <item msgid="8584357129746649222">"Местоположение"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кратко"</item>
     <item msgid="2560532955514699713">"Средно"</item>
     <item msgid="2372711992605524591">"Продължително"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (отстраняване на грешки)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Използване на Dalvik"</item>
+    <item msgid="5131846588686178907">"Използване на ART"</item>
+    <item msgid="4530003713865319928">"Използване на версията на ART за отстраняване на грешки"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Никога да не се проверява"</item>
     <item msgid="6042769699089883931">"Проверка само за DRM съдържание"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"На екрана като линии"</item>
     <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Изключено"</item>
+    <item msgid="7688197031296835369">"Области за преизчертаване: Показв."</item>
+    <item msgid="8332661909019981149">"Брояч на преизчертаване: Показване"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартно ограничение"</item>
     <item msgid="4071574792028999443">"Няма процеси на заден план"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 621ceea1e9a..72221bbf447 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -275,8 +275,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_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>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Изисква се цифров PIN код или парола за разшифроване на таблета ви при всяко включване"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Изисква се цифров PIN код или парола за разшифроване на телефона ви при всяко включване"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Шифровано"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Можете да шифровате своите профили, настройки, изтеглени приложения и данните им, мултимедийни и други файлове. След като направите това за таблета си, трябва да въвеждате цифров ПИН код или парола, за да го разшифровате при всяко включване. Не можете да отмените процеса освен чрез възстановяване на фабричните настройки, което ще изтрие всичките ви данни."\n\n"Шифроването отнема най-малко един час. Трябва да започнете със заредена батерия и таблетът ви да е включен към захранването, докато процесът завърши. Ако го прекъснете, ще загубите някои или всичките си данни."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Можете да шифровате своите профили, настройки, изтеглени приложения и данните им, мултимедийни и други файлове. След като направите това за телефона си, трябва да въвеждате цифров ПИН код или парола, за да го разшифровате при всяко включване. Не можете да отмените процеса освен чрез възстановяване на фабричните настройки, което ще изтрие всичките ви данни."\n\n"Шифроването отнема най-малко един час. Трябва да започнете със заредена батерия и телефонът ви да е включен към захранването, докато процесът завърши. Ако го прекъснете, ще загубите някои или всичките си данни."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Можете да шифровате своите профили, настройки, изтеглени приложения и данните им, мултимедийни и други файлове. След като направите това за таблета си, трябва да въвеждате цифров ПИН код или парола, за да го разшифровате при всяко включване. Не можете да отмените процеса освен чрез възстановяване на фабричните настройки, което ще изтрие всичките ви данни.\n\nШифроването отнема най-малко един час. Трябва да започнете със заредена батерия и таблетът ви да е включен към захранването, докато процесът завърши. Ако го прекъснете, ще загубите някои или всичките си данни."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Можете да шифровате своите профили, настройки, изтеглени приложения и данните им, мултимедийни и други файлове. След като направите това за телефона си, трябва да въвеждате цифров ПИН код или парола, за да го разшифровате при всяко включване. Не можете да отмените процеса освен чрез възстановяване на фабричните настройки, което ще изтрие всичките ви данни.\n\nШифроването отнема най-малко един час. Трябва да започнете със заредена батерия и телефонът ви да е включен към захранването, докато процесът завърши. Ако го прекъснете, ще загубите някои или всичките си данни."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Шифроване на таблета"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Шифроване на телефона"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Заредете батерията си и опитайте отново."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Опитайте отново след <xliff:g id="DELAY">^1</xliff:g> секунди."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Въведете паролата си"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифроването не бе успешно"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шифроването бе прекъснато и не може да завърши. В резултат на това вече няма достъп до данните на таблета ви."\n\n"За да възобновите използването му, трябва да възстановите фабричните настройки. След това, когато го настройвате, ще имате възможност да възстановите всички данни, на които е направено резервно копие в профила ви в Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шифроването бе прекъснато и не може да завърши. В резултат на това вече няма достъп до данните на телефона ви."\n\n"За да възобновите използването му, трябва да възстановите фабричните настройки. След това, когато го настройвате, ще имате възможност да възстановите всички данни, на които е направено резервно копие в профила ви в Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шифроването бе прекъснато и не може да завърши. В резултат на това вече няма достъп до данните на таблета ви.\n\nЗа да възобновите използването му, трябва да възстановите фабричните настройки. След това, когато го настройвате, ще имате възможност да възстановите всички данни, на които е направено резервно копие в профила ви в Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шифроването бе прекъснато и не може да завърши. В резултат на това вече няма достъп до данните на телефона ви.\n\nЗа да възобновите използването му, трябва да възстановите фабричните настройки. След това, когато го настройвате, ще имате възможност да възстановите всички данни, на които е направено резервно копие в профила ви в Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Превключване на метода на въвеждане"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Закл. на екрана: Избор"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Резервно заключване"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Установява се връзка"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Установена е връзка"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Налице"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Използва се"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Настройки за дисплея"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Да се изключи ли?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Това ще прекрати връзката ви със:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,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">"Когато тази функция е включена, можете да излъчвате съдържание от приложенията до друго устройство с поддръжка за КБП, като държите устройствата близо едно до друго. Например можете да излъчвате страници от Браузър, видеоклипове от YouTube, контакти от Хора и др.\n\nТрябва само да поставите устройствата едно до друго (обикновено задните им страни), след което да докоснете екрана си. Приложението определя какво се излъчва."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Откриване на услугата за мрежа"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Разрешаване на приложенията от други устройства да намират приложения на това устройство"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Защитено с <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", защитено с <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Няма"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"За да подобри точността на местоположението и за други цели, <xliff:g id="APP_NAME">%1$s</xliff:g> иска да включи сканирането за мрежи дори когато Wi-Fi е изключен."\n\n"Искате ли да разрешите това за всички приложения, които искат да сканират?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"За да подобри точността на местоположението и за други цели, <xliff:g id="APP_NAME">%1$s</xliff:g> иска да включи сканирането за мрежи дори когато Wi-Fi е изключен.\n\nИскате ли да разрешите това за всички приложения, които искат да сканират?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Разрешаване"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Отказ"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Свързване"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"Предупреждение: Това може да доведе до допълнителни таксувания за данни от оператора.\n\nНастройката на таблета може да изисква значителна активност на мрежата."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"Предупреждение: Това може да доведе до допълнителни таксувания за данни от оператора.\n\nНастройката на телефона може да изисква значителна активност на мрежата."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ПРЕДУПРЕЖДЕНИЕ: Докато нямате връзка с интернет, таблетът няма да може да потвърди, че софтуерът ви е актуален."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ПРЕДУПРЕЖДЕНИЕ: Докато нямате връзка с интернет, телефонът няма да може да потвърди, че софтуерът ви е актуален."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Таблетът не можа да се свърже с тази Wi‑Fi мрежа."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN за SIM карта"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Неправилен ПИН"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"ПИН кодовете не са идентични"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"ПИН кодът не може да се промени."\n"Възможен неправилен ПИН."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"ПИН кодът не може да се промени.\nВъзможен неправилен ПИН."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Успешна промяна на PIN за SIM карта"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Не може да се промени състоянието на заключване на SIM картата."\n"Възможен неправилен ПИН."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Не може да се промени състоянието на заключване на SIM картата.\nВъзможен неправилен ПИН."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Отказ"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Състояние на таблета"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Възстановяване на фабричните настройки"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Изтрива всички данни на таблета"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Изтрива всички данни на телефона"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на таблета ви, включително:"\n\n<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на телефона ви, включително:"\n\n<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Понастоящем сте влезли в следните профили:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на таблета ви, включително:\n\n"<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на телефона ви, включително:\n\n"<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Понастоящем сте влезли в следните профили:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Снимки"</li>\n<li>"Други потребителски данни"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"За да изчистите музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"USB хранилището"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"За да изчистите музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"SD картата"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Кеширани процеси"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Нулиране"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Да се нулират предпоч.?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Това ще нулира всички предпочитания за:"\n\n" "<li>"деактивираните приложения;"</li>\n" "<li>"известията за деактивирани приложения;"</li>\n" "<li>"стандартните приложения за действия;"</li>\n" "<li>"ограниченията на данните на заден план за приложенията."</li>\n\n" Няма да загубите данни от приложенията."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Това ще нулира всички предпочитания за:\n\n "<li>"деактивираните приложения;"</li>\n" "<li>"известията за деактивирани приложения;"</li>\n" "<li>"стандартните приложения за действия;"</li>\n" "<li>"ограниченията на данните на заден план за приложенията."</li>\n\n" Няма да загубите данни от приложенията."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Нулиране на приложенията"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Управление на място"</string>
     <string name="filter" msgid="2018011724373033887">"Филтриране"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"За превключване натиснете „Ctrl“-интервал"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"По подразбиране"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Клавиатурни подредби"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Потребителски речник"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Личен речник"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Лични речници"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Личен речник"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Добавяне"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Добавяне в речника"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Включване на опцията за получаване на сигнал за програмна грешка в менюто за захранване"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Да остане активен"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Екранът никога няма да е в спящ режим при зареждане"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Активиране на регистрационния файл за анализ на пакетите в команден ред за Bluetooth с протокола HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Заснемане на всички пакети за Bluetooth с протокола HCI във файла"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Избор на изпълним модул"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Избор на изпълним модул"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Да се рестартира ли за промяна на изпълнимия модул от „<xliff:g id="OLD">%1$s</xliff:g>“ на „<xliff:g id="NEW">%2$s</xliff:g>“?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Разрешаване на измислени местоположения"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешаване на измислени местоположения"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Разрешаване на отстраняването на грешки през USB?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Да се защити USB хранилището"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Прилож. трябва да поискат разрешение за четене на USB хран."</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Да се защити ли USB хранилището?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Когато USB паметта е защитена, приложенията трябва да поискат разрешение за четене на данни от външното хранилище."\n\n"Някои от тях може да не работят, докато не бъдат актуализирани от съответните програмисти."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Когато USB паметта е защитена, приложенията трябва да поискат разрешение за четене на данни от външното хранилище.\n\nНякои от тях може да не работят, докато не бъдат актуализирани от съответните програмисти."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Да се защити SD картата"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Прилож. трябва да поискат разрешение за четене на SD картата"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Да се защити ли SD картата?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Когато SD картата е защитена, приложенията трябва да поискат разрешение за четене на данни от външното хранилище."\n\n"Някои от тях може да не работят, докато не бъдат актуализирани от съответните програмисти."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Когато SD картата е защитена, приложенията трябва да поискат разрешение за четене на данни от външното хранилище.\n\nНякои от тях може да не работят, докато не бъдат актуализирани от съответните програмисти."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Локален терминал"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Актив. на прил. за терминал с достъп до локалния команден ред"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Избор на притурка"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Избор на приспособление"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Да се създаде ли приспособлението и да се разреши ли достъп?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Услуги"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Жестове за увеличение"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Когато тази функция е включена, можете да увеличите или намалите мащаба, като докоснете екрана три пъти."\n\n"При увеличен мащаб можете:"\n<ul><li>"Да извършите панорамно преместване: Плъзнете два или повече пръста по екрана."</li>\n<li>"Да коригирате нивото на мащаба: Съберете заедно или разгънете два или повече пръста."</li></ul>\n\n"Можете също временно да промените мащаба на това, което е под пръста ви, като докоснете три пъти и задържите. В това променено състояние можете да плъзнете пръста си, за да изследвате различни части на екрана. Вдигнете го, за да се върнете към предишното състояние."\n\n"Забележка: Докосването три пъти за промяна на мащаба работи навсякъде освен при клавиатурата и навигационната лента."</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_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>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack осигурява устна обратна връзка, за да помогне на потребители с увредено и намалено зрение. Искате ли да го инсталирате безплатно от Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Няма описание."</string>
     <string name="settings_button" msgid="3006713718908152930">"Настройки"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Отпечатване"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Настройки за отпечатване"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Услуги"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Да се използва ли <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> може да получава отпечатваните от вас документи. Възможно е те да съдържат поверителни данни."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Няма инсталирани услуги"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Настройки"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Добавяне на принтери"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Включено"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Изключено"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Батерия"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Какво е използвало батерията"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Няма данни за употр. на батерията."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Работещ Wi‑Fi"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Таблет"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Телефон"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Изпратени данни"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Получени данни"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Мобилните данни са изпратени"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Мобилните данни са получени"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Данните през Wi-Fi са изпратени"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Данните през Wi-Fi са получени"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Аудио"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Видео"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Продължителност на включване"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Височина"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Отразява се на тона на изговорения текст"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Език"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Езикът не е избран"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Задава глас за конкретен език за изговорения текст"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Чуйте пример"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Възпроизвеждане на кратка демонстрация на синтезиране на реч"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"Не се поддържа EAP."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Не можете да конфигурирате Wi‑Fi връзка с редактиране на точката за достъп (EAP) по време на настройката. След това можете да го направите от „Настройки“ &gt; „Кабелни и безжични мрежи“."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Свързването може да отнеме няколко минути..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Докоснете "<b>"Напред"</b>", за да продължите с настройката."\n\n"Докоснете "<b>"Назад"</b>", за да се свържете с друга Wi‑Fi мрежа."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Докоснете "<b>"Напред"</b>", за да продължите с настройката.\n\nДокоснете "<b>"Назад"</b>", за да се свържете с друга Wi‑Fi мрежа."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Синхронизирането е активирано"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синхронизирането е деактивирано"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Грешка при синхронизирането."</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Отстран. на проблеми, свързани с преизчертаване от ГП"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Хардуерни наслагвания: Деактив."</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Винаги да се използва GPU за изграждане на екрана"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Трасирания на OpenGL: Акт."</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Деактив. на данните на заден план за моб. мрежи. Ще се използват немобилни, ако са налице."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"За по-малко данни на заден план за прилож. намалете мобилните."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Да се ограничат ли данните на заден план?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Тази функция може да доведе до спиране на работата на приложение, което зависи от данните на заден план, когато са налице само мобилни мрежи."\n\n"Можете да намерите по-подходящи контроли за използването на данните в наличните в приложението настройки."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Тази функция може да доведе до спиране на работата на приложение, което зависи от данните на заден план, когато са налице само мобилни мрежи.\n\nМожете да намерите по-подходящи контроли за използването на данните в наличните в приложението настройки."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Ограничаването на данните на заден план е възможно само когато сте задали ограничение на мобилните данни."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Да се вкл. ли авт. синхр. на данни?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Всички промени, които правите в профилите си в мрежата, ще бъдат копирани автоматично в таблета ви."\n\n"Някои профили могат също да копират автоматично в мрежата извършените от вас промени в таблета. Профилът в Google работи по този начин."\n\n"За да изберете какви видове информация да се синхронизира във всеки профил, отворете „Настройки“ &gt; „Профили“."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Всички промени, които правите в профилите си в мрежата, ще бъдат копирани автоматично в телефона ви."\n\n"Някои профили могат също да копират автоматично в мрежата извършените от вас промени в телефона. Профилът в Google работи по този начин."\n\n"За да изберете какви видове информация да се синхронизира във всеки профил, отворете „Настройки“ &gt; „Профили“."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Всички промени, които правите в профилите си в мрежата, ще бъдат копирани автоматично в таблета ви.\n\nНякои профили могат също да копират автоматично в мрежата извършените от вас промени в таблета. Профилът в Google работи по този начин.\n\nЗа да изберете какви видове информация да се синхронизира във всеки профил, отворете „Настройки“ &gt; „Профили“."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Всички промени, които правите в профилите си в мрежата, ще бъдат копирани автоматично в телефона ви.\n\nНякои профили могат също да копират автоматично в мрежата извършените от вас промени в телефона. Профилът в Google работи по този начин.\n\nЗа да изберете какви видове информация да се синхронизира във всеки профил, отворете „Настройки“ &gt; „Профили“."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Да се изкл. ли авт. синхр. на данни?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Това ще спести използването на данни и батерия, но ще трябва да синхронизирате ръчно всеки профил, за да събирате скорошна информация. Няма да получавате и известия, когато има актуализации."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Дата на възстановяване на цикъла за използване"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Задаване на предупреждение за ползване на данни"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Задаване на ограничение за ползване на данни"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ограничаване на използването на данни"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Мобилната ви връзка за данни ще бъде деактивирана при достигане на посочения лимит."\n\n"Тъй като използването им се измерва от таблета ви, а операторът ви може да го отчита по различен начин, помислете дали да не използвате умерен лимит."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Мобилната ви връзка за данни ще бъде деактивирана при достигане на посочения лимит."\n\n"Тъй като използването им се измерва от телефона ви, а операторът ви може да го отчита по различен начин, помислете дали да не използвате умерен лимит."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Мобилната ви връзка за данни ще бъде деактивирана при достигане на посочения лимит.\n\nТъй като използването им се измерва от таблета ви, а операторът ви може да го отчита по различен начин, помислете дали да не използвате умерен лимит."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Мобилната ви връзка за данни ще бъде деактивирана при достигане на посочения лимит.\n\nТъй като използването им се измерва от телефона ви, а операторът ви може да го отчита по различен начин, помислете дали да не използвате умерен лимит."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Да се ограничат ли данните на заден план?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Ако ограничите мобилните данни на заден план, някои приложения и услуги няма да работят, освен ако не сте свързани с Wi‑Fi мрежа."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ако ограничите мобилните данни на заден план, някои приложения и услуги няма да работят, освен ако не сте свързани с Wi‑Fi мрежа."\n\n"Настройката засяга всички потребители на този таблет."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ако ограничите мобилните данни на заден план, някои приложения и услуги няма да работят, освен ако не сте свързани с Wi‑Fi мрежа."\n\n"Настройката засяга всички потребители на този телефон."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ако ограничите мобилните данни на заден план, някои приложения и услуги няма да работят, освен ако не сте свързани с Wi‑Fi мрежа.\n\nНастройката засяга всички потребители на този таблет."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ако ограничите мобилните данни на заден план, някои приложения и услуги няма да работят, освен ако не сте свързани с Wi‑Fi мрежа.\n\nНастройката засяга всички потребители на този телефон."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"предупреждение"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ограничение"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Премахнати приложения"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Потребител"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ограничен потр. профил"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Добавяне на нов потребител"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Можете да споделите това устройство с други хора, като създадете допълнителни потребители. Всеки от тях има собствено работно пространство, което може да персонализира със свои собствени приложения, тапет и др. Те могат да коригират и настройки на таблета, като например Wi‑Fi, които засягат всички."\n\n"След като създадете нов потребител, той трябва да премине през процеса за настройка."\n\n"Всеки потребител може да приема разрешения на актуализирани приложения от името на всички останали."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"След като създадете нов потребител, той трябва да премине през процеса за настройка."\n\n"Всеки потребител може да приема разрешения на актуализирани приложения от името на всички останали."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Можете да споделите това устройство с други хора, като създадете допълнителни потребители. Всеки от тях има собствено работно пространство, което може да персонализира със свои собствени приложения, тапет и др. Те могат да коригират и настройки на таблета, като например Wi‑Fi, които засягат всички.\n\nСлед като създадете нов потребител, той трябва да премине през процеса за настройка.\n\nВсеки потребител може да приема разрешения на актуализирани приложения от името на всички останали."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"След като създадете нов потребител, той трябва да премине през процеса за настройка.\n\nВсеки потребител може да приема разрешения на актуализирани приложения от името на всички останали."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Настройване на потребителя?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Уверете се, че човекът е налице да вземе таблета и да настрои работното си пространство"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Ще настроите ли потребителския профил сега?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Настройката засяга всички потребители на този телефон."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Промяна на езика"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Промяна на размера на шрифта"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Ограничения"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Oграничения: Премахване"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Промяна на ПИН кода"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Известия: Показване"</string>
     <string name="help_label" msgid="1107174367904110532">"Помощ"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Профил за съдържание"</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 02cadad83dd..938f74d496b 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -153,12 +153,12 @@
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Sempre"</item>
-    <item msgid="844721238536786870">"Només quan està endollat"</item>
+    <item msgid="844721238536786870">"Només quan s\'estigui carregant"</item>
     <item msgid="2990218920631468642">"Mai (augmenta l\'ús de dades)"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Sempre"</item>
-    <item msgid="7433294150916905997">"Només quan està endollat"</item>
+    <item msgid="7433294150916905997">"Només quan s\'estigui carregant"</item>
     <item msgid="1390404486722375028">"Mai"</item>
   </string-array>
   <string-array name="wifi_frequency_band_entries">
@@ -200,7 +200,7 @@
   <string-array name="emergency_tone_entries">
     <item msgid="5165439859689033665">"Desactivat"</item>
     <item msgid="3165868966179561687">"Alerta"</item>
-    <item msgid="6038758039030476855">"Vibra"</item>
+    <item msgid="6038758039030476855">"Vibració"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Cap"</item>
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Ubicació"</item>
     <item msgid="255608127647030286">"Personal"</item>
     <item msgid="4588829735729884491">"Missatgeria"</item>
-    <item msgid="8971765125227378270">"Dispositiu"</item>
+    <item msgid="886742181977884584">"Multimèdia"</item>
+    <item msgid="7924928667052300589">"Dispositiu"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"ubicació aproximada"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"reprodueix l\'àudio"</item>
     <item msgid="8374996688066472414">"llegeix el porta-retalls"</item>
     <item msgid="3045529469061083747">"modifica el porta-retalls"</item>
+    <item msgid="5124443975763747838">"botons multimèdia"</item>
+    <item msgid="4547883971364273343">"enfocament de l\'àudio"</item>
+    <item msgid="2603878814882344450">"volum general"</item>
+    <item msgid="7136963238377062018">"volum de la veu"</item>
+    <item msgid="4270236897655923007">"volum del to"</item>
+    <item msgid="6325739889222559394">"volum multimèdia"</item>
+    <item msgid="5762123934816216821">"volum de l\'alarma"</item>
+    <item msgid="785049718065337473">"volum de notificació"</item>
+    <item msgid="6700305533746877052">"volum del Bluetooth"</item>
+    <item msgid="2029227495214047094">"actiu"</item>
+    <item msgid="26109888160231211">"supervisa la ubicació"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Ubicació"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Reprodueix l\'àudio"</item>
     <item msgid="136815868796597058">"Llegeix el porta-retalls"</item>
     <item msgid="5238692940326972503">"Modifica el porta-retalls"</item>
+    <item msgid="5753789168376302997">"Botons de multimèdia"</item>
+    <item msgid="3265262911688671938">"Enfocament de l\'àudio"</item>
+    <item msgid="2098976479485046797">"Volum general"</item>
+    <item msgid="5660213838861789350">"Volum de la veu"</item>
+    <item msgid="7983336752371254444">"Volum del to"</item>
+    <item msgid="7878027809189330917">"Volum de multimèdia"</item>
+    <item msgid="7260546305036218513">"Volum de l\'alarma"</item>
+    <item msgid="9103719301075748925">"Volum de notificació"</item>
+    <item msgid="7025966722295861512">"Volum de Bluetooth"</item>
+    <item msgid="4665183401128289653">"Actiu"</item>
+    <item msgid="8584357129746649222">"Ubicació"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curt"</item>
     <item msgid="2560532955514699713">"Mitjà"</item>
     <item msgid="2372711992605524591">"Llarg"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (depuració)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Fes servir Dalvik"</item>
+    <item msgid="5131846588686178907">"Fes servir ART"</item>
+    <item msgid="4530003713865319928">"Fes servir la compilació de depuració ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"No comprovis mai"</item>
     <item msgid="6042769699089883931">"Comprova només el contingut DRM"</item>
@@ -354,12 +387,12 @@
     <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>
+    <item msgid="1340692776955662664">"Pila de trucades a glGetError"</item>
   </string-array>
   <string-array name="show_non_rect_clip_entries">
     <item msgid="993742912147090253">"Desactivada"</item>
-    <item msgid="675719912558941285">"Pintar blava regió retall no rect."</item>
-    <item msgid="1064373276095698656">"Dest. ordres dibuix provad. en verd"</item>
+    <item msgid="675719912558941285">"Àrea retall no rectangular en blau"</item>
+    <item msgid="1064373276095698656">"Ressalta ordres de dibuix provats en verd"</item>
   </string-array>
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Desactivat"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"A la pantalla com a línies"</item>
     <item msgid="120512413928262547">"A adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Desactiva"</item>
+    <item msgid="7688197031296835369">"Mostra les àrees modificades"</item>
+    <item msgid="8332661909019981149">"Mostra comptador modificacions"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Límit estàndard"</item>
     <item msgid="4071574792028999443">"Sense processos en segon pla"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index e462178af96..e3e5d46f1d5 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -275,8 +275,8 @@
     <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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Si permets la itinerància de dades, és possible que se t\'apliquin càrrecs per itinerància significatius.\n\nAquesta configuració afecta tots els usuaris de la tauleta."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Si permets la itinerància de dades, és possible que se t\'apliquin càrrecs per itinerància significatius.\n\nAquesta configuració afecta tots els usuaris del telèfon."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Vols permetre la itinerància de dades?"</string>
     <string name="networks" msgid="6333316876545927039">"Selecció d\'operador"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Selecciona un operador de xarxa"</string>
@@ -322,8 +322,8 @@
     <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 comptes, les configuracions, les aplicacions baixades i les seves dades, els elements multimèdia i altres fitxers. Una vegada encriptada la teva tauleta, has d\'introduir un PIN numèric o una contrasenya per desencriptar-la cada vegada que l\'engeguis (només podràs desencriptar-la restablint les dades de fàbrica i esborrant-ne totes les dades)."\n\n"El procés d\'encriptació triga fins a una hora. Cal que iniciïs aquest procés amb la bateria carregada i que mantinguis la tauleta connectada fins que no s\'hagi completat l\'encriptació. Si s\'interromp el procés d\'encriptació, perdràs totes les teves dades o bé una part."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Pots encriptar els comptes, les configuracions, les aplicacions baixades i les seves dades, els elements multimèdia i altres fitxers. Una vegada encriptat el telèfon, necessitaràs un PIN numèric o contrasenya per desencriptar-lo cada vegada que l\'encenguis (només podràs desencriptar-la restablint les dades de fàbrica i esborrant-ne totes les dades)."\n\n"El procés d\'encriptació triga fins a una hora. Cal que iniciïs aquest procés amb la bateria carregada i que mantinguis el telèfon connectat fins que no s\'hagi completat l\'encriptació. Si s\'interromp el procés d\'encriptació, perdràs totes les teves dades o bé una part."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Pots encriptar els comptes, les configuracions, les aplicacions baixades i les seves dades, els elements multimèdia i altres fitxers. Una vegada encriptada la teva tauleta, has d\'introduir un PIN numèric o una contrasenya per desencriptar-la cada vegada que l\'engeguis (només podràs desencriptar-la restablint les dades de fàbrica i esborrant-ne totes les dades).\n\nEl procés d\'encriptació triga fins a una hora. Cal que iniciïs aquest procés amb la bateria carregada i que mantinguis la tauleta connectada fins que no s\'hagi completat l\'encriptació. Si s\'interromp el procés d\'encriptació, perdràs totes les teves dades o bé una part."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Pots encriptar els comptes, les configuracions, les aplicacions baixades i les seves dades, els elements multimèdia i altres fitxers. Una vegada encriptat el telèfon, necessitaràs un PIN numèric o contrasenya per desencriptar-lo cada vegada que l\'encenguis (només podràs desencriptar-la restablint les dades de fàbrica i esborrant-ne totes les dades).\n\nEl procés d\'encriptació triga fins a una hora. Cal que iniciïs aquest procés amb la bateria carregada i que mantinguis el telèfon connectat fins que no s\'hagi completat l\'encriptació. Si s\'interromp el procés d\'encriptació, perdràs totes les teves dades o bé una part."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encripta la tauleta"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encripta el telèfon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carrega la bateria i torna-ho a provar."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Torna-ho a provar d\'aquí a <xliff:g id="DELAY">^1</xliff:g> segons."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Escriu la contrasenya"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"S\'ha produït un error en encriptar"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"S\'ha interromput l\'encriptació i no es pot completar. A conseqüència d\'això, ja no es pot accedir a les dades de la tauleta. "\n\n"Per reprendre l\'ús de la tauleta, cal que duguis a terme un restabliment de fàbrica. Quan configuris la tauleta després del restabliment, tindràs l\'oportunitat de restaurar les dades de les quals s\'hagi fet una còpia de seguretat al teu compte de Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"S\'ha interromput l\'encriptació i no es pot completar. A conseqüència d\'això, ja no es pot accedir a les dades del telèfon. "\n\n"Per reprendre l\'ús del telèfon, cal que duguis a terme un restabliment de fàbrica. Quan configuris el telèfon després del restabliment, tindràs l\'oportunitat de restaurar les dades de les quals s\'hagi fet una còpia de seguretat al teu compte de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"S\'ha interromput l\'encriptació i no es pot completar. A conseqüència d\'això, ja no es pot accedir a les dades de la tauleta. \n\nPer reprendre l\'ús de la tauleta, cal que duguis a terme un restabliment de fàbrica. Quan configuris la tauleta després del restabliment, tindràs l\'oportunitat de restaurar les dades de les quals s\'hagi fet una còpia de seguretat al teu compte de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"S\'ha interromput l\'encriptació i no es pot completar. A conseqüència d\'això, ja no es pot accedir a les dades del telèfon. \n\nPer reprendre l\'ús del telèfon, cal que duguis a terme un restabliment de fàbrica. Quan configuris el telèfon després del restabliment, tindràs l\'oportunitat de restaurar les dades de les quals s\'hagi fet una còpia de seguretat al teu compte de Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Canvia el mètode d\'introducció"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Tria bloqueig de pantalla"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Tria bloq. còpia seg."</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"S\'està connectant"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Connectada"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponible"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"En ús"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Mostra la configuració"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Vols desconnectar-te?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Això posarà fi a la teva connexió amb:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"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">"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="android_beam_explained" msgid="6981652347448777459">"Si la funció Android Beam està activada, pots col·locar un dispositiu a prop d\'un altre compatible amb tecnologia NFC per compartir contingut d\'aplicacions. Per exemple, pots transferir pàgines del navegador, vídeos de YouTube, contactes i molt més.\n\nCol·loca els dispositius a prop (generalment, l\'un d\'esquena a l\'altre) i, a continuació, toca la pantalla del teu dispositiu. L\'aplicació determina el contingut que es pot transferir."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Detectabilitat del servei de xarxa"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permet que les aplicacions d\'altres dispositius descobreixin les aplicacions d\'aquest"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegida amb <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegida amb <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Cap"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Per millorar la precisió de la ubicació i per a altres finalitats, <xliff:g id="APP_NAME">%1$s</xliff:g> vol activar la cerca de xarxes tot i que la connexió Wi-Fi estigui desactivada."\n\n"Vols permetre-ho per a totes les aplicacions que vulguin cercar xarxes?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Per millorar la precisió de la ubicació i per a altres finalitats, <xliff:g id="APP_NAME">%1$s</xliff:g> vol activar la cerca de xarxes tot i que la connexió Wi-Fi estigui desactivada.\n\nVols permetre-ho per a totes les aplicacions que vulguin cercar xarxes?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permet"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Denega"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connecta"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"ADVERTIMENT: És possible que l\'operador de telefonia mòbil apliqui càrrecs addicionals.\n\nLa configuració de la tauleta pot necessitar una gran quantitat d\'activitat de xarxa."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ADVERTIMENT: És possible que l\'operador de telefonia mòbil apliqui càrrecs addicionals.\n\nLa configuració del telèfon pot necessitar una gran quantitat d\'activitat de xarxa."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ADVERTIMENT: Fins que no tingueu una connexió a Internet, la tauleta no podrà verificar que el programari estigui actualitzat."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ADVERTIMENT: Fins que no tingueu una connexió a Internet, el telèfon no podrà verificar que el programari estigui actualitzat."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"La tauleta no ha pogut connectar amb aquesta xarxa Wi-Fi."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN de la SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN incorrecte"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Els codis PIN no coincideixen"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"No es pot canviar el PIN."\n"És possible que sigui incorrecte."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"No es pot canviar el PIN.\nÉs possible que sigui incorrecte."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN de la SIM canviat correctament"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"No es pot canviar l\'estat de bloqueig de la targeta SD."\n"És possible que el PIN sigui incorrecte."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"No es pot canviar l\'estat de bloqueig de la targeta SD.\nÉs possible que el PIN sigui incorrecte."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"D\'acord"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancel·la"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estat de la tauleta"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Restableix dades de fàbrica"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Esborra totes les dades de la tauleta"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Esborra totes les dades del telèfon"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" de la tauleta, és a dir:"\n\n<li>"El teu compte de Google"</li>\n<li>"Les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"Les aplicacions baixades"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" del teu telèfon, és a dir:"\n\n<li>"El teu compte de Google"</li>\n<li>"Les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"Les aplicacions baixades"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualment has iniciat la sessió als comptes següents:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" de la tauleta, és a dir:\n\n"<li>"El teu compte de Google"</li>\n<li>"Les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"Les aplicacions baixades"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" del teu telèfon, és a dir:\n\n"<li>"El teu compte de Google"</li>\n<li>"Les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"Les aplicacions baixades"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualment has iniciat la sessió als comptes següents:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Altres dades de l\'usuari"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Per esborrar també música, imatges i altres dades d\'usuari, cal esborrar l\'"<b>"emmagatzematge USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Si vols suprimir música, imatges i altres dades de l\'usuari, cal que esborris la "<b>"targeta SD"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Mostra processos cau"</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 en segon pla per a aplicacions"</li>\n\n" No perdràs les dades de les aplicacions."</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>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Per canviar, prem Ctrl + barra espaiadora"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predeterminat"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Disposicions de teclat"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diccionari de l\'usuari"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Diccionari personal"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Diccionaris personals"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Diccionari personal"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Afegeix"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Afegir al diccionari"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Inclou l\'opció de fer un informe d\'error al menú d\'encesa"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Pantalla activa"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla no entra mai en mode de repòs si el dispositiu està carregant-se"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activa el registre de cerca HCI de Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Captura tots els paquets HCI de Bluetooth en un fitxer"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Selecciona temps execució"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Selecciona temps execució"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Vols tornar a iniciar per canviar el temps d\'execució de <xliff:g id="OLD">%1$s</xliff:g> a <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permet les ubicacions simulades"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permet les ubicacions simulades"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Voleu permetre la depuració USB?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Protegeix emmagatzematge USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Les aplicacions han de sol·licitar permís per llegir l\'emmagatzematge USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Vols protegir l\'emmagatzematge USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Quan l\'emmagatzematge USB està protegit, les aplicacions han de sol·licitar permís per llegir les dades de l\'emmagatzematge extern."\n\n"És possible que algunes aplicacions no funcionin fins que els desenvolupadors no les actualitzin."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Quan l\'emmagatzematge USB està protegit, les aplicacions han de sol·licitar permís per llegir les dades de l\'emmagatzematge extern.\n\nÉs possible que algunes aplicacions no funcionin fins que els desenvolupadors no les actualitzin."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Protecció de la targeta SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Les aplicacions han de sol·licitar permís per llegir la targeta SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vols protegir la targeta SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Si la targeta SD està protegida, les aplicacions han de sol·licitar permís per llegir les dades de l\'emmagatzematge extern."\n\n"És possible que algunes aplicacions no funcionin fins que els desenvolupadors no les actualitzin."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Si la targeta SD està protegida, les aplicacions han de sol·licitar permís per llegir les dades de l\'emmagatzematge extern.\n\nÉs possible que algunes aplicacions no funcionin fins que els desenvolupadors no les actualitzin."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal local"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Activa l\'aplicació de terminal que ofereix accés al shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Selecció de gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Selecció de widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vols crear el widget i permetre l\'accés?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Serveis"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</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_screen_magnification_summary" msgid="2380627654189671754">"Quan aquesta funció està activada, pots ampliar o allunyar si piques tres cops la pantalla.\n\nQuan ampliïs, pots fer el següent.\n"<ul><li>"Panoràmica: arrossega dos dits o més per la pantalla."</li>\n<li>"Ajustar el nivell de zoom: apropa dos o més dits o bé separa\'ls."</li></ul>\n\n"També pots ampliar de manera temporal el que tinguis a sota del dit si piques tres cops i mantens premut. En aquest estat ampliat, pots arrossegar el dit per explorar diverses parts de la pantalla. Aixeca el dit per tornar a l\'estat previ.\n\nNota: Pica tres cops per ampliar a tot arreu tret de la barra de navegació i el teclat."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Drecera d\'accessibilitat"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Activada"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desactiva"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Quan aquesta funció està activada, pots activar ràpidament les funcions d\'accessibilitat en dos passos."\n\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_global_gesture_preference_description" msgid="750438015254396963">"Quan aquesta funció està activada, pots activar ràpidament les funcions d\'accessibilitat en dos passos.\n\nPas 1: mantén premut el botó d\'engegada fins que sentis un so o notis una vibració.\n\nPas 2: mantén premut amb dos dits fins que sentis una confirmació d\'àudio.\n\nSi el dispositiu té diversos usuaris, fer servir aquesta drecera a la pantalla de bloqueig activa temporalment l\'accessibilitat fins que es desbloqueja el dispositiu."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Text gran"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ampliació de pantalla"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualitza ampliació automàticament"</string>
@@ -1366,6 +1372,16 @@
     <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_service_default_description" msgid="1072730037861494125">"No s\'ha proporcionat cap descripció."</string>
     <string name="settings_button" msgid="3006713718908152930">"Configuració"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Impressió"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Configuració d\'impressió"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Serveis"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vols fer servir <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> pot rebre els documents que imprimeixis. És possible que aquests documents continguin dades confidencials."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"No hi ha cap servei instal·lat"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Configuració"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Afegeix impressores"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Activat"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Desactivat"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Elements que han utilitzat la bateria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Dades d\'ús de bateria no disp."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi en execució"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tauleta"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telèfon"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Dades enviades"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Dades rebudes"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"S\'han enviat les dades mòbils"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"S\'han rebut les dades mòbils"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"S\'han enviat les dades Wi‑Fi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"S\'han rebut les dades Wi‑Fi"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Àudio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Vídeo"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Temps d\'activació"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"To"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afecta el to del text parlat"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"No has seleccionat cap idioma"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Defineix la llengua utilitzada per a la síntesi de veu"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Vull escoltar un exemple"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Reprodueix una breu demostració de síntesi de veu"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP no és compatible."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"No pots configurar una connexió Wi-Fi EAP durant la configuració. Quan hagi finalitzat, pots dur a terme aquesta acció a Configuració &gt; Sense fil i xarxes."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"La connexió pot trigar una estona..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toca "<b>"Següent"</b>" per continuar amb la configuració."\n\n"Toca "<b>"Enrere"</b>" per connectar a una altra xarxa Wi‑Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toca "<b>"Següent"</b>" per continuar amb la configuració.\n\nToca "<b>"Enrere"</b>" per connectar a una altra xarxa Wi‑Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronització activada"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronització desactivada"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Error de sincronització"</string>
@@ -1622,7 +1641,7 @@
     <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">"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="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Et donem la benvinguda a Google Sync!"</font>" \nLa sincronització de dades que ha ideat Google per permetre l\'accés als contactes, a les cites i a molts més elements des de qualsevol lloc."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Configuració de la sincronització d\'aplicacions"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dades i sincronització"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Canvia la contrasenya"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Depura modificacions GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Desactiva superposicions HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Usa sempre GPU per combinar pantalles"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Activa seguiment d\'OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Desactiva dades en segon pla en xarxes mòbils. S\'utilitzaran xarxes no mòbils si estan disponibles."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Per restringir dades en segon pla, estableix un límit de dades mòbils."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Vols restringir les dades en segon pla?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Aquesta funció pot provocar que una aplicació que depengui de les dades en segon pla deixi de funcionar quan hi hagi només xarxes mòbils disponibles."\n\n"Pots trobar més controls d\'ús de dades adequats a la configuració disponible a l\'aplicació."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Aquesta funció pot provocar que una aplicació que depengui de les dades en segon pla deixi de funcionar quan hi hagi només xarxes mòbils disponibles.\n\nPots trobar més controls d\'ús de dades adequats a la configuració disponible a l\'aplicació."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Només pots restringir les dades en segon pla si has establert un límit de dades mòbils."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Activar sincronització automàtica?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Els canvis que facis als teus comptes al web es reflectiran automàticament a la tauleta."\n\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_on_dialog" product="tablet" msgid="7312283529426636845">"Els canvis que facis als teus comptes al web es reflectiran automàticament a la tauleta.\n\nAlguns comptes com ara els comptes de Google també reflectiran al web els canvis que facis a la tauleta.\n\nPer triar els tipus d\'informació que vols que se sincronitzi en cada compte, vés a Configuració &gt; Comptes."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Els canvis que facis als teus comptes al web es reflectiran automàticament al telèfon.\n\nAlguns comptes, com ara els comptes de Google, també reflectiran al web els canvis que hagis fet al telèfon.\n\nPer triar els tipus d\'informació que vols que se sincronitzi en cada compte, vés a Configuració &gt; Comptes."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Vols desactivar sinc. au. dades?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Es conservaran les dades i l\'ús de bateria, però hauràs de sincronitzar els comptes manualment per recopilar la informació recent. I no rebràs notificacions quan hi hagi actualitzacions."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de restabliment del cicle d\'ús"</string>
@@ -1751,13 +1769,13 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Defineix l\'advertiment d\'ús de dades"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Defineix el límit d\'ús de dades"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitació de l\'ús de dades"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"La teva connexió de dades mòbil es desactivarà quan s\'arribi al límit especificat."\n\n"Com que la tauleta mesura la utilització de dades i és possible que l\'operador faci un recompte diferent de la utilització, et recomanem que facis servir un límit prudent."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"La teva connexió de dades mòbil es desactivarà quan s\'arribi al límit especificat."\n\n"Com que el telèfon mesura la utilització de dades i és possible que l\'operador faci un recompte diferent de la utilització, et recomanem que facis servir un límit prudent."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"La teva connexió de dades mòbil es desactivarà quan s\'arribi al límit especificat.\n\nCom que la tauleta mesura la utilització de dades i és possible que l\'operador faci un recompte diferent de la utilització, et recomanem que facis servir un límit prudent."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"La teva connexió de dades mòbil es desactivarà quan s\'arribi al límit especificat.\n\nCom que el telèfon mesura la utilització de dades i és possible que l\'operador faci un recompte diferent de la utilització, et recomanem que facis servir un límit prudent."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vols restringir les dades en segon pla?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Si restringeixes les dades mòbils en segon pla, algunes aplicacions i serveis no funcionaran si no estàs connectat a una xarxa Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Si restringeixes les dades mòbils en segon pla, algunes aplicacions i serveis no funcionaran si no estàs connectat a una xarxa Wi-Fi."\n\n"Aquesta configuració afecta tots els usuaris de la tauleta."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Si restringeixes les dades mòbils en segon pla, algunes aplicacions i serveis no funcionaran si no estàs connectat a una xarxa Wi-Fi."\n\n"Aquesta configuració afecta tots els usuaris del telèfon."</string>
-    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">" <xliff:g id="NUMBER">^1</xliff:g> "</font>" "<font size="9">" <xliff:g id="UNIT">^2</xliff:g> "</font>" "\n" "<font size="12">"advertència"</font></string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Si restringeixes les dades mòbils en segon pla, algunes aplicacions i serveis no funcionaran si no estàs connectat a una xarxa Wi-Fi.\n\nAquesta configuració afecta tots els usuaris de la tauleta."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Si restringeixes les dades mòbils en segon pla, algunes aplicacions i serveis no funcionaran si no estàs connectat a una xarxa Wi-Fi.\n\nAquesta configuració afecta tots els usuaris del telèfon."</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">" <xliff:g id="NUMBER">^1</xliff:g> "</font>" "<font size="9">" <xliff:g id="UNIT">^2</xliff:g> "</font>" \n "<font size="12">"advertència"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limitació"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicacions eliminades"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Aplicacions i usuaris eliminats"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuari"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restringit"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Afegir un usuari nou"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Pots compartir aquest dispositiu amb altres persones si crees usuaris addicionals. Cada usuari té el seu propi espai, que podrà personalitzar amb les seves aplicacions, els seus fons de pantalla i altres elements. Els usuaris també podran ajustar la configuració de la tauleta, com ara la Wi-Fi, que pot afectar altres persones."\n\n"Quan hagis creat un usuari nou, aquesta persona haurà de dur a terme un procés de configuració."\n\n"Qualsevol usuari pot acceptar els permisos actualitzats d\'aplicacions en nom de la resta d\'usuaris."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"Quan afegeixis un usuari nou, aquesta persona ha de dur a terme un procés de configuració."\n\n"Qualsevol usuari pot acceptar permisos d\'aplicacions actualitzats en nom de la resta d\'usuaris."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Pots compartir aquest dispositiu amb altres persones si crees usuaris addicionals. Cada usuari té el seu propi espai, que podrà personalitzar amb les seves aplicacions, els seus fons de pantalla i altres elements. Els usuaris també podran ajustar la configuració de la tauleta, com ara la Wi-Fi, que pot afectar altres persones.\n\nQuan hagis creat un usuari nou, aquesta persona haurà de dur a terme un procés de configuració.\n\nQualsevol usuari pot acceptar els permisos actualitzats d\'aplicacions en nom de la resta d\'usuaris."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Quan afegeixis un usuari nou, aquesta persona ha de dur a terme un procés de configuració.\n\nQualsevol usuari pot acceptar permisos d\'aplicacions actualitzats en nom de la resta d\'usuaris."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Vols configurar l\'usuari ara?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Comprova que l\'usuari té accés a la tauleta i pot configurar el seu espai."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Vols configurar el perfil ara?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Aquesta configuració afecta tots els usuaris del telèfon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Canvi de l\'idioma"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Canvi del cos de lletra"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Restriccions"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Suprimeix restriccions"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Canvia el PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostra les notificacions"</string>
     <string name="help_label" msgid="1107174367904110532">"Ajuda"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Compte per al contingut"</string>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 0fa7e0532da..fda9dcd73da 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Poloha"</item>
     <item msgid="255608127647030286">"Osobní"</item>
     <item msgid="4588829735729884491">"SMS a MMS"</item>
-    <item msgid="8971765125227378270">"Zařízení"</item>
+    <item msgid="886742181977884584">"Média"</item>
+    <item msgid="7924928667052300589">"Zařízení"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"přibližná poloha"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"přehrávání zvuku"</item>
     <item msgid="8374996688066472414">"číst obsah schránky"</item>
     <item msgid="3045529469061083747">"upravit obsah schránky"</item>
+    <item msgid="5124443975763747838">"tlačítka médií"</item>
+    <item msgid="4547883971364273343">"zaměření zvuku"</item>
+    <item msgid="2603878814882344450">"hlavní hlasitost"</item>
+    <item msgid="7136963238377062018">"hlasitost hlasu"</item>
+    <item msgid="4270236897655923007">"hlasitost vyzvánění"</item>
+    <item msgid="6325739889222559394">"hlasitost médií"</item>
+    <item msgid="5762123934816216821">"hlasitost budíku"</item>
+    <item msgid="785049718065337473">"hlasitost oznámení"</item>
+    <item msgid="6700305533746877052">"hlasitost Bluetooth"</item>
+    <item msgid="2029227495214047094">"Zakázat režim spánku"</item>
+    <item msgid="26109888160231211">"sledovat polohu"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Poloha"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Přehrávání zvuku"</item>
     <item msgid="136815868796597058">"Číst obsah schránky"</item>
     <item msgid="5238692940326972503">"Upravit obsah schránky"</item>
+    <item msgid="5753789168376302997">"Tlačítka médií"</item>
+    <item msgid="3265262911688671938">"Zaměření zvuku"</item>
+    <item msgid="2098976479485046797">"Hlavní hlasitost"</item>
+    <item msgid="5660213838861789350">"Hlasitost hlasu"</item>
+    <item msgid="7983336752371254444">"Hlasitost vyzvánění"</item>
+    <item msgid="7878027809189330917">"Hlasitost médií"</item>
+    <item msgid="7260546305036218513">"Hlasitost budíku"</item>
+    <item msgid="9103719301075748925">"Hlasitost oznámení"</item>
+    <item msgid="7025966722295861512">"Hlasitost Bluetooth"</item>
+    <item msgid="4665183401128289653">"Zakázat režim spánku"</item>
+    <item msgid="8584357129746649222">"Poloha"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krátká"</item>
     <item msgid="2560532955514699713">"Střední"</item>
     <item msgid="2372711992605524591">"Dlouhá"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (režim ladění)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Použít program Dalvik"</item>
+    <item msgid="5131846588686178907">"Použít program ART"</item>
+    <item msgid="4530003713865319928">"Použít ladicí sestavení programu ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nikdy nekontrolovat"</item>
     <item msgid="6042769699089883931">"Kontrolovat jen obsah DRM"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Na obrazovce ve formě řádků"</item>
     <item msgid="120512413928262547">"V adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Vypnuto"</item>
+    <item msgid="7688197031296835369">"Zobrazit překreslované oblasti"</item>
+    <item msgid="8332661909019981149">"Zobrazit počítadlo překreslení"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardní limit"</item>
     <item msgid="4071574792028999443">"Procesy na pozadí deaktivovány"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 4d91c65cb84..5333a2269a5 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Pokud aktivujete datový roaming, mohou vám být za roaming účtovány nemalé poplatky.\n\nToto nastavení ovlivní všechny uživatele tohoto tabletu."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Pokud aktivujete datový roaming, mohou vám být za roaming účtovány nemalé poplatky.\n\nToto nastavení ovlivní všechny uživatele tohoto telefonu."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Povolit datový roaming?"</string>
     <string name="networks" msgid="6333316876545927039">"Výběr operátora"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Vybrat síťového operátora"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Při každém zapnutí tabletu vyžadovat kód PIN nebo heslo za účelem dešifrování"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Při každém zapnutí telefonu vyžadovat kód PIN nebo heslo za účelem dešifrování"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrováno"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Účty, nastavení, stažené aplikace a jejich data, média a jiné soubory můžete zašifrovat. Po zašifrování tabletu je třeba při každém zapnutí zadat číselný kód PIN nebo heslo, kterým ho opět dešifrujete. Zašifrování tabletu lze zrušit pouze obnovením továrních dat, při kterém budou vymazána všechna vaše data."\n\n"Proces šifrování trvá hodinu i více. Začněte s nabitou baterií a ponechte tablet připojený ke zdroji napájení, dokud se šifrování nedokončí. Pokud proces šifrování přerušíte, může dojít ke ztrátě některých nebo všech vašich dat."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Účty, nastavení, stažené aplikace a jejich data, média a jiné soubory můžete zašifrovat. Po zašifrování musíte při každém zapnutí telefonu vložit číselný kód PIN nebo heslo, abyste ho opět dešifrovali. Zašifrování telefonu lze zrušit pouze obnovením továrních dat, při kterém budou vymazána všechna vaše data."\n\n"Proces zašifrování trvá hodinu i více. Začněte s nabitou baterií a ponechte telefon připojený ke zdroji napájení, dokud nebude šifrování dokončeno. Pokud proces šifrování přerušíte, může dojít ke ztrátě některých nebo všech vašich dat."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Účty, nastavení, stažené aplikace a jejich data, média a jiné soubory můžete zašifrovat. Po zašifrování tabletu je třeba při každém zapnutí zadat číselný kód PIN nebo heslo, kterým ho opět dešifrujete. Zašifrování tabletu lze zrušit pouze obnovením továrních dat, při kterém budou vymazána všechna vaše data.\n\nProces šifrování trvá hodinu i více. Začněte s nabitou baterií a ponechte tablet připojený ke zdroji napájení, dokud se šifrování nedokončí. Pokud proces šifrování přerušíte, může dojít ke ztrátě některých nebo všech vašich dat."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Účty, nastavení, stažené aplikace a jejich data, média a jiné soubory můžete zašifrovat. Po zašifrování musíte při každém zapnutí telefonu vložit číselný kód PIN nebo heslo, abyste ho opět dešifrovali. Zašifrování telefonu lze zrušit pouze obnovením továrních dat, při kterém budou vymazána všechna vaše data.\n\nProces zašifrování trvá hodinu i více. Začněte s nabitou baterií a ponechte telefon připojený ke zdroji napájení, dokud nebude šifrování dokončeno. Pokud proces šifrování přerušíte, může dojít ke ztrátě některých nebo všech vašich dat."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifrovat tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifrovat telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Nabijte baterii a zkuste to znovu."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Zkuste to znovu za: <xliff:g id="DELAY">^1</xliff:g> s."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Zadejte heslo"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifrování se nezdařilo"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifrování bylo přerušeno a nelze je dokončit. V důsledku toho již nebudou údaje v tabletu přístupné. "\n\n" Chcete-li tablet opět začít používat, je potřeba obnovit tovární nastavení. Po obnově budete moci v průběhu nastavení tabletu obnovit všechna data, která jsou zálohována v účtu Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifrování bylo přerušeno a nelze je dokončit. V důsledku toho již nebudou údaje v telefonu přístupné. "\n\n"Chcete-li telefon opět začít používat, je potřeba obnovit tovární nastavení. Po obnově budete moci v průběhu nastavení telefonu obnovit všechna data, která jsou zálohována v účtu Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifrování bylo přerušeno a nelze je dokončit. V důsledku toho již nebudou údaje v tabletu přístupné. \n\n Chcete-li tablet opět začít používat, je potřeba obnovit tovární nastavení. Po obnově budete moci v průběhu nastavení tabletu obnovit všechna data, která jsou zálohována v účtu Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifrování bylo přerušeno a nelze je dokončit. V důsledku toho již nebudou údaje v telefonu přístupné. \n\nChcete-li telefon opět začít používat, je potřeba obnovit tovární nastavení. Po obnově budete moci v průběhu nastavení telefonu obnovit všechna data, která jsou zálohována v účtu Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Přepnout metodu zadávání"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Vybrat zámek obrazovky"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Výběr záložního zámku"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Připojování"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Připojené"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Dostupné"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Používá se"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Nastavení displeje"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Odpojit?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Tímto ukončíte připojení k zařízení:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Vypnuto"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Není k dispozici, protože je vypnuta funkce NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Pokud je funkce zapnuta, můžete přenášet obsah aplikace do jiného zařízení s funkcí NFC tím, že podržíte zařízení blízko sebe. Můžete například přenášet stránky prohlížeče, videa YouTube, kontakty a další."\n\n"Přiložte zařízení k sobě (zpravidla zadní stranou) a dotkněte se obrazovky. Aplikace určí, jaký obsah se bude přenášet."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Pokud je funkce zapnuta, můžete přenášet obsah aplikace do jiného zařízení s funkcí NFC tím, že podržíte zařízení blízko sebe. Můžete například přenášet stránky prohlížeče, videa YouTube, kontakty a další.\n\nPřiložte zařízení k sobě (zpravidla zadní stranou) a dotkněte se obrazovky. Aplikace určí, jaký obsah se bude přenášet."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Zjistitelnost po síti"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Povolit aplikacím v jiných zařízeních vyhledávat aplikace v tomto zařízení"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zabezpečení: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpečení <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Žádné"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnout vyhledávání sítí (kvůli lepšímu určení polohy i kvůli jiným účelům) a hledat sítě i v případě, že je vypnut modul Wi-Fi."\n\n"Chcete tuto možnost povolit všem aplikacím, které chtějí vyhledávat sítě?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnout vyhledávání sítí (kvůli lepšímu určení polohy i kvůli jiným účelům) a hledat sítě i v případě, že je vypnut modul Wi-Fi.\n\nChcete tuto možnost povolit všem aplikacím, které chtějí vyhledávat sítě?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Povolit"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Zamítnout"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Připojit"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"UPOZORNĚNÍ: Může dojít k tomu, že vám operátor bude účtovat vyšší poplatky než obvykle.\n\nNastavení tabletu může vyžadovat přenos nemalého množství dat."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"UPOZORNĚNÍ: Může dojít k tomu, že vám operátor bude účtovat vyšší poplatky než obvykle.\n\nNastavení telefonu může vyžadovat přenos nemalého množství dat."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"UPOZORNĚNÍ: Dokud nebudete připojeni k internetu, tablet nebude moci ověřit, zda je software aktuální."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"UPOZORNĚNÍ: Dokud nebudete připojeni k internetu, telefon nebude moci ověřit, zda je software aktuální."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tabletu se nepodařilo připojit k této síti Wi-Fi."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN SIM karty"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Nesprávný kód PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Kódy PIN nejsou shodné"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Kód PIN nelze změnit."\n"Možná jste zadali nesprávný kód PIN."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Kód PIN nelze změnit.\nMožná jste zadali nesprávný kód PIN."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN SIM karty byl úspěšně změněn."</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Stav zámku SIM karty nelze změnit."\n"Zřejmě jste zadali nesprávný kód PIN."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Stav zámku SIM karty nelze změnit.\nZřejmě jste zadali nesprávný kód PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Zrušit"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stav tabletu"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Obnovení továrních dat"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Vymaže všechna data v tabletu"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Vymaže všechna data v telefonu"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" tabletu, mimo jiné následují:"\n\n<li>"váš účet Google,"</li>\n<li>"nastavení a data systému a aplikací,"</li>\n<li>"stažené aplikace."</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" telefonu, mimo jiné i následující:"\n\n<li>"váš účet Google,"</li>\n<li>"nastavení a data systému a aplikací,"</li>\n<li>"stažené aplikace."</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálně jste přihlášeni k těmto účtům:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" tabletu, mimo jiné následují:\n\n"<li>"váš účet Google,"</li>\n<li>"nastavení a data systému a aplikací,"</li>\n<li>"stažené aplikace."</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" telefonu, mimo jiné i následující:\n\n"<li>"váš účet Google,"</li>\n<li>"nastavení a data systému a aplikací,"</li>\n<li>"stažené aplikace."</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálně jste přihlášeni k těmto účtům:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Hudba"</li>\n<li>"Fotky"</li>\n<li>"Další uživatelské údaje"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"úložiště USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"kartu SD"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Zobrazit mezipaměť"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Obnovit nastavení apl."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Obnovit nastavení apl.?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Touto akcí obnovíte všechna nastavení pro:"\n\n" "<li>"deaktivované aplikace,"</li>\n" "<li>"deaktivovaná oznámení aplikací,"</li>\n" "<li>"výchozí aplikace k provádění akcí,"</li>\n" "<li>"omezení dat na pozadí pro aplikace."</li>\n\n" O žádná data aplikací nepřijdete."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Touto akcí obnovíte všechna nastavení pro:\n\n "<li>"deaktivované aplikace,"</li>\n" "<li>"deaktivovaná oznámení aplikací,"</li>\n" "<li>"výchozí aplikace k provádění akcí,"</li>\n" "<li>"omezení dat na pozadí pro aplikace."</li>\n\n" O žádná data aplikací nepřijdete."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Obnovit aplikace"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Správa paměti"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrovat"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Přepněte klávesami ctrl+mezerník"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Výchozí"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Rozložení klávesnice"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Uživatelský slovník"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Osobní slovník"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Osobní slovníky"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Osobní slovník"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Přidat"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Přidat do slovníku"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Zahrnout v hlavní nabídce možnost k vytvoření zprávy o chybách"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Nevypínat obrazovku"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Obrazovka se při nabíjení nepřepne do režimu spánku"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Povolit sledovací protokol Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zachytit všechny pakety Bluetooth HCI do souboru"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Výběr modulu runtime"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Výběr modulu runtime"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Chcete provést restart a změnit modul runtime z <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Povolit simulované polohy"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Povolit simulované polohy"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Povolit ladění USB?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Chránit úložiště USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplikace musejí před čtením z úložiště USB žádat o povolení"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Chránit úložiště USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Pokud je úložiště USB chráněno, musejí aplikace před čtením dat z externího úložiště požádat o povolení."\n\n"Některé aplikace nemusejí fungovat, dokud je vývojáři neaktualizují."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Pokud je úložiště USB chráněno, musejí aplikace před čtením dat z externího úložiště požádat o povolení.\n\nNěkteré aplikace nemusejí fungovat, dokud je vývojáři neaktualizují."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Chránit kartu SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikace musejí před čtením z karty SD žádat o povolení"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Chránit kartu SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Pokud je karta SD chráněná, musejí aplikace před čtením dat z externího úložiště požádat o povolení."\n\n"Některé aplikace nemusejí fungovat, dokud je vývojáři neaktualizují."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Pokud je karta SD chráněná, musejí aplikace před čtením dat z externího úložiště požádat o povolení.\n\nNěkteré aplikace nemusejí fungovat, dokud je vývojáři neaktualizují."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Místní terminál"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Aktivovat terminálovou apl. pro místní přístup k prostředí shell"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Zvolte gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Zvolte widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vytvořit widget a povolit přístup?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Služby"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Systém"</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_screen_magnification_summary" msgid="2380627654189671754">"Je-li tato funkce zapnutá, můžete zobrazení přibližovat a oddalovat tak, že třikrát klepnete na obrazovku.\n\nPři přiblížení můžete provádět tyto činnosti:\n"<ul><li>"Posunutí: táhněte po obrazovce minimálně dvěma prsty."</li>\n<li>"Změna úrovně přiblížení: alespoň dva prsty stáhněte k sobě, nebo roztáhněte od sebe."</li></ul>\n\n"Také je možné dočasně zvětšit oblast pod prstem. Stačí na ni třikrát klepnout a podržet ji. V takto zvětšeném náhledu můžete přetáhnutím prstu prohlížet libovolné části obrazovky. Do předchozího zobrazení se vrátíte zdvihnutím prstu.\n\nPoznámka: Zvětšení trojitým klepnutím funguje ve všech částech obrazovky s výjimkou klávesnice a navigační lišty."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Zkratka usnadnění"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Zapnuto"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Vyp."</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Je-li tato funkce zapnutá, můžete rychle ve dvou krocích aktivovat funkce usnadnění přístupu:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Je-li tato funkce zapnutá, můžete rychle ve dvou krocích aktivovat funkce usnadnění přístupu:\n\nKrok 1: Stiskněte tlačítko napájení a držte jej, dokud neuslyšíte zvuk nebo neucítíte vibraci.\n\nKrok 2: Dotkněte se obrazovky dvěma prsty a držte ji, dokud neuslyšíte potvrzovací zvuk.\n\nMá-li zařízení více uživatelů, pomocí této zkratky lze na uzamčené obrazovce dočasně aktivovat usnadnění přístupu, dokud zařízení nebude odemčeno."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Velký text"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Přiblížení obrazovky"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automaticky aktualizovat přiblížení"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack poskytuje mluvenou navigaci nevidomým a slabozrakým uživatelům. Chcete tuto aplikaci stáhnout zdarma ze služby Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"K dispozici není žádný popis."</string>
     <string name="settings_button" msgid="3006713718908152930">"Nastavení"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Tisk"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Nastavení tisku"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Služby"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Chcete použít službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"Služba <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> může přijímat dokumenty, které tisknete. Tyto dokumenty mohou obsahovat citlivá data."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Žádná služba není nainstalována"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Nastavení"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Přidat tiskárny"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Zapnuto"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Vypnuto"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterie"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Co využívá baterii"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Údaje o spotřebě nejsou známy."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi je aktivní"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Odeslaná data"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Přijatá data"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Odeslané mobilní datové přenosy"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Přijaté mobilní datové přenosy"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Odeslané datové přenosy Wi‑Fi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Přijaté datové přenosy Wi‑Fi"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Zvuk"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Doba zapnutí"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Výška"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Určuje rejstřík mluveného textu"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Jazyk"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nebyl vybrán jazyk"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Nastavení jazyka hlasu pro mluvený text"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Poslechnout příklad"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Přehrát krátkou ukázku syntézy řeči"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"Protokol EAP není podporován."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Připojení Wi-Fi EAP nelze nakonfigurovat při instalaci. Můžete to provést po dokončení instalace v části Nastavení &gt; Bezdrátová připojení a sítě."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Připojování může trvat několik minut..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Chcete-li pokračovat v nastavení, klepněte na "<b>"Další"</b>"."\n\n"Chcete-li se připojit k jiné síti Wi-Fi, klepněte na "<b>"Zpět"</b>"."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Chcete-li pokračovat v nastavení, klepněte na "<b>"Další"</b>".\n\nChcete-li se připojit k jiné síti Wi-Fi, klepněte na "<b>"Zpět"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronizace zapnuta"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronizace deaktivována"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Chyba synchronizace."</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalendář"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kontakty"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Vítá vás aplikace Google Sync."</font>" "\n"Nový pohled společnosti Google na synchronizaci dat vám poskytuje přístup ke kontaktům, schůzkám a dalším informacím, ať jste kdekoli."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Vítá vás aplikace Google Sync."</font>" \nNový pohled společnosti Google na synchronizaci dat vám poskytuje přístup ke kontaktům, schůzkám a dalším informacím, ať jste kdekoli."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Nastavení synchronizace aplikací"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data a synchronizace"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Změnit heslo"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Ladění překreslování GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Zakázat HW vrstvy"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Vždy použít GPU ke skládání obrazovky."</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Povolit trasování OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Zakázat data na pozadí v mobilních sítích. Používat jiné sítě."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Data na pozadí u aplikace omezíte nastavením limitu mob. dat."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Omezení datových přenosů na pozadí?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Pokud budou k dispozici pouze mobilní sítě, může tato funkce způsobit, že aplikace, které data na pozadí vyžadují, nebudou fungovat."\n\n"Vhodnější způsoby řízení využívání dat naleznete v nastavení aplikace."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Pokud budou k dispozici pouze mobilní sítě, může tato funkce způsobit, že aplikace, které data na pozadí vyžadují, nebudou fungovat.\n\nVhodnější způsoby řízení využívání dat naleznete v nastavení aplikace."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Omezení dat na pozadí je k dispozici pouze v případě, že jste nastavili limit přenosu mobilních dat."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Zapnout aut. synchronizaci dat?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Změny, které v rámci svých účtů provedete na webu, se automaticky zkopírují do tabletu."\n\n"Některé účty také automaticky zkopírují změny provedené v tabletu na web. Tímto způsobem funguje například účet Google."\n\n"Typy informací, které se budou v jednotlivých účtech synchronizovat, nastavíte v části Nastavení &gt; Účty."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Změny, které v rámci svých účtů provedete na webu, se automaticky zkopírují do telefonu."\n\n"Některé účty také automaticky zkopírují změny provedené v telefonu na web. Tímto způsobem funguje například účet Google."\n\n"Typy informací, které se budou v jednotlivých účtech synchronizovat, nastavíte v části Nastavení &gt; Účty."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Změny, které v rámci svých účtů provedete na webu, se automaticky zkopírují do tabletu.\n\nNěkteré účty také automaticky zkopírují změny provedené v tabletu na web. Tímto způsobem funguje například účet Google.\n\nTypy informací, které se budou v jednotlivých účtech synchronizovat, nastavíte v části Nastavení &gt; Účty."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Změny, které v rámci svých účtů provedete na webu, se automaticky zkopírují do telefonu.\n\nNěkteré účty také automaticky zkopírují změny provedené v telefonu na web. Tímto způsobem funguje například účet Google.\n\nTypy informací, které se budou v jednotlivých účtech synchronizovat, nastavíte v části Nastavení &gt; Účty."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Vypnout aut. synchronizaci dat?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Toto nastavení šetří využití dat a baterii. Nejnovější informace však bude třeba získávat pomocí ruční synchronizace účtu a nebudete také dostávat oznámení o dostupných aktualizacích."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum obnovení cyklu sledování přenesených dat"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Nastavit upozornění na využití dat"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Nastavení limitu datových přenosů"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Nastavuje se omezení datových přenosů"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Po dosažení stanoveného limitu bude datové připojení k síti zakázáno."\n\n"Protože se přenesená data měří pomocí tabletu a operátor je může účtovat odlišně, je vhodné nastavit nízký limit."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Po dosažení stanoveného limitu bude datové připojení k síti zakázáno."\n\n"Protože se přenesená data měří pomocí telefonu a operátor je může účtovat odlišně, je vhodné nastavit nízký limit."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Po dosažení stanoveného limitu bude datové připojení k síti zakázáno.\n\nProtože se přenesená data měří pomocí tabletu a operátor je může účtovat odlišně, je vhodné nastavit nízký limit."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Po dosažení stanoveného limitu bude datové připojení k síti zakázáno.\n\nProtože se přenesená data měří pomocí telefonu a operátor je může účtovat odlišně, je vhodné nastavit nízký limit."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Omezení datových přenosů na pozadí?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Pokud omezíte využití mobilních dat na pozadí, některé aplikace a služby nebudou fungovat, dokud se nepřipojíte k síti Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Pokud omezíte využití mobilních dat na pozadí, některé aplikace a služby nebudou fungovat, dokud se nepřipojíte k síti Wi-Fi."\n\n"Toto nastavení ovlivní všechny uživatele tohoto tabletu."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Pokud omezíte využití mobilních dat na pozadí, některé aplikace a služby nebudou fungovat, dokud se nepřipojíte k síti Wi-Fi."\n\n"Toto nastavení ovlivní všechny uživatele tohoto telefonu."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Pokud omezíte využití mobilních dat na pozadí, některé aplikace a služby nebudou fungovat, dokud se nepřipojíte k síti Wi-Fi.\n\nToto nastavení ovlivní všechny uživatele tohoto tabletu."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Pokud omezíte využití mobilních dat na pozadí, některé aplikace a služby nebudou fungovat, dokud se nepřipojíte k síti Wi-Fi.\n\nToto nastavení ovlivní všechny uživatele tohoto telefonu."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"upozornění"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="12">"limit:"</font>" "<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n</string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Odebrané aplikace"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Uživatel"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Omezený profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Přidat nového uživatele"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Vytvořením dalších uživatelů můžete toto zařízení sdílet s jinými lidmi. Každý uživatel má své prostředí, které může personalizovat, nainstalovat své aplikace, tapetu atd. Uživatelé také mohou upravit nastavení tabletu (např. Wi-Fi), která ovlivní všechny ostatní uživatele."\n\n"Když vytvoříte nového uživatele, daná osoba bude muset projít procesem nastavení."\n\n"Každý uživatel může přijmout aktualizovaná oprávnění aplikací jménem všech ostatních uživatelů."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"Když vytvoříte nového uživatele, bude muset provést nastavení."\n\n"Každý uživatel může přijmout aktualizovaná oprávnění aplikací jménem všech ostatních uživatelů."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Vytvořením dalších uživatelů můžete toto zařízení sdílet s jinými lidmi. Každý uživatel má své prostředí, které může personalizovat, nainstalovat své aplikace, tapetu atd. Uživatelé také mohou upravit nastavení tabletu (např. Wi-Fi), která ovlivní všechny ostatní uživatele.\n\nKdyž vytvoříte nového uživatele, daná osoba bude muset projít procesem nastavení.\n\nKaždý uživatel může přijmout aktualizovaná oprávnění aplikací jménem všech ostatních uživatelů."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Když vytvoříte nového uživatele, bude muset provést nastavení.\n\nKaždý uživatel může přijmout aktualizovaná oprávnění aplikací jménem všech ostatních uživatelů."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Nastavit uživatele?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Ujistěte se, že je uživatel k dispozici a může si na tabletu nastavit svůj prostor"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Nastavit profil?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Toto nastavení ovlivní všechny uživatele tohoto telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Změna jazyka"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Změna velikosti písma"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Omezení"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Odebrat omezení"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Změnit PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Zobrazit upozornění"</string>
     <string name="help_label" msgid="1107174367904110532">"Nápověda"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Účet pro obsah"</string>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 1dd81787512..45cd4fb0ed1 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Placering"</item>
     <item msgid="255608127647030286">"Personlig"</item>
     <item msgid="4588829735729884491">"Beskeder"</item>
-    <item msgid="8971765125227378270">"Enhed"</item>
+    <item msgid="886742181977884584">"Medier"</item>
+    <item msgid="7924928667052300589">"Enhed"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"omtrentlig placering"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"afspil lyd"</item>
     <item msgid="8374996688066472414">"læs udklipsholder"</item>
     <item msgid="3045529469061083747">"rediger udklipsholder"</item>
+    <item msgid="5124443975763747838">"medieknapper"</item>
+    <item msgid="4547883971364273343">"lydfokusering"</item>
+    <item msgid="2603878814882344450">"generel lydstyrke"</item>
+    <item msgid="7136963238377062018">"lydstyrke for stemme"</item>
+    <item msgid="4270236897655923007">"lydstyrke for ringetone"</item>
+    <item msgid="6325739889222559394">"lydstyrke for medier"</item>
+    <item msgid="5762123934816216821">"alarmlydstyrke"</item>
+    <item msgid="785049718065337473">"lydstyrke for underretninger"</item>
+    <item msgid="6700305533746877052">"lydstyrke for bluetooth"</item>
+    <item msgid="2029227495214047094">"hold aktiv"</item>
+    <item msgid="26109888160231211">"overvåg placering"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Placering"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Afspil lyd"</item>
     <item msgid="136815868796597058">"Læs udklipsholder"</item>
     <item msgid="5238692940326972503">"Rediger udklipsholder"</item>
+    <item msgid="5753789168376302997">"Medieknapper"</item>
+    <item msgid="3265262911688671938">"Lydfokusering"</item>
+    <item msgid="2098976479485046797">"Generel lydstyrke"</item>
+    <item msgid="5660213838861789350">"Lydstyrke for stemme"</item>
+    <item msgid="7983336752371254444">"Lydstyrke for ringetone"</item>
+    <item msgid="7878027809189330917">"Lydstyrke for medier"</item>
+    <item msgid="7260546305036218513">"Alarmlydstyrke"</item>
+    <item msgid="9103719301075748925">"Lydstyrke for underretninger"</item>
+    <item msgid="7025966722295861512">"Lydstyrke for bluetooth"</item>
+    <item msgid="4665183401128289653">"Hold aktiv"</item>
+    <item msgid="8584357129746649222">"Placering"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Mellem"</item>
     <item msgid="2372711992605524591">"Lang"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (debug)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Brug Dalvik"</item>
+    <item msgid="5131846588686178907">"Brug ART"</item>
+    <item msgid="4530003713865319928">"Brug ART debug build"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Kontroller aldrig"</item>
     <item msgid="6042769699089883931">"Kontroller kun for DRM-indhold"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"På skærmen som linier"</item>
     <item msgid="120512413928262547">"{0}Trans: left untranslated according to ws.{/0}{0} - daDA Wlgg 01/10/13 11:18{/0}"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Fra"</item>
+    <item msgid="7688197031296835369">"Vis områder med overlap"</item>
+    <item msgid="8332661909019981149">"Vis antallet af overlap"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardgrænse"</item>
     <item msgid="4071574792028999443">"Ingen baggrundsprocesser"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 48d6699f7ea..f7f52765cbd 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Når du tillader dataroaming, kan du blive udsat for væsentlige roamingudgifter.\n\nDenne indstilling påvirker alle brugere på denne tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Når du tillader dataroaming, kan du blive udsat for væsentlige roamingudgifter.\n\nDenne indstilling påvirker alle brugere på denne telefon."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Vil du tillade dataroaming?"</string>
     <string name="networks" msgid="6333316876545927039">"Valg af udbyder"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Vælg en netværksudbyder"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Kræv en numerisk pinkode eller adgangskode for at dekryptere din tablet, hver gang du tænder for den"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Kræv en numerisk pinkode eller adgangskode for at dekryptere din telefon, hver gang du tænder for den"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krypteret"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Du kan kryptere dine konti, indstillinger, downloadede apps og deres data, medier og andre filer. Når du krypterer din tablet, skal du indtaste en numerisk pinkode eller adgangskode for at dekryptere den, hver gang du tænder for den. Du kan kun dekryptere din tablet ved at udføre en nulstilling af fabriksdata, som sletter alle dine data."\n\n"Krypteringen tager mindst en time. Når du starter krypteringen, skal batteriet være fuldt opladet, og du skal sørge for, at din tablet forbliver sluttet til strøm, indtil krypteringen er gennemført. Hvis du afbryder krypteringen, mister du nogle eller alle data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Du kan kryptere dine konti, indstillinger, downloadede apps og deres data, medier og andre filer. Når du krypterer din telefon, skal du indtaste en numerisk pinkode eller adgangskode for at dekryptere den, hver gang du tænder for den. Du kan kun  dekryptere din telefon ved at udføre en nulstilling af fabriksdata, som sletter alle dine data."\n\n"Krypteringen tager mindst en time. Når du starter krypteringen, skal batteriet være fuldt opladet, og du skal sørge for, at din telefon forbliver sluttet til strøm, indtil krypteringen er gennemført. Hvis du afbryder krypteringen, mister du nogle eller alle data."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Du kan kryptere dine konti, indstillinger, downloadede apps og deres data, medier og andre filer. Når du krypterer din tablet, skal du indtaste en numerisk pinkode eller adgangskode for at dekryptere den, hver gang du tænder for den. Du kan kun dekryptere din tablet ved at udføre en nulstilling af fabriksdata, som sletter alle dine data.\n\nKrypteringen tager mindst en time. Når du starter krypteringen, skal batteriet være fuldt opladet, og du skal sørge for, at din tablet forbliver sluttet til strøm, indtil krypteringen er gennemført. Hvis du afbryder krypteringen, mister du nogle eller alle data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Du kan kryptere dine konti, indstillinger, downloadede apps og deres data, medier og andre filer. Når du krypterer din telefon, skal du indtaste en numerisk pinkode eller adgangskode for at dekryptere den, hver gang du tænder for den. Du kan kun  dekryptere din telefon ved at udføre en nulstilling af fabriksdata, som sletter alle dine data.\n\nKrypteringen tager mindst en time. Når du starter krypteringen, skal batteriet være fuldt opladet, og du skal sørge for, at din telefon forbliver sluttet til strøm, indtil krypteringen er gennemført. Hvis du afbryder krypteringen, mister du nogle eller alle data."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Krypter tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Krypter telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Lad dit batteri op, og prøv igen."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Prøv igen om <xliff:g id="DELAY">^1</xliff:g> sekunder."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Indtast din adgangskode"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Kryptering mislykkedes"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krypteringen blev afbrudt og kan ikke fuldføres. Som følge heraf er dataene på din tablet ikke længere tilgængelige. "\n\n"Hvis du vil genoptage brugen af din  tablet, skal du udføre en nulstilling af fabriksdata. Når du konfigurerer din tablet efter nulstillingen, har du mulighed for at gendanne data, der blev sikkerhedskopieret på din Google-konto."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krypteringen blev afbrudt og kan ikke fuldføres. Som følge heraf er dataene på din telefon ikke længere tilgængelige. "\n\n"Hvis du vil genoptage brugen af telefonen, skal du udføre en nulstilling af fabriksdata. Når du konfigurerer din telefon efter nulstillingen, har du mulighed for at gendanne data, der blev sikkerhedskopieret på din Google-konto."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krypteringen blev afbrudt og kan ikke fuldføres. Som følge heraf er dataene på din tablet ikke længere tilgængelige. \n\nHvis du vil genoptage brugen af din  tablet, skal du udføre en nulstilling af fabriksdata. Når du konfigurerer din tablet efter nulstillingen, har du mulighed for at gendanne data, der blev sikkerhedskopieret på din Google-konto."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krypteringen blev afbrudt og kan ikke fuldføres. Som følge heraf er dataene på din telefon ikke længere tilgængelige. \n\nHvis du vil genoptage brugen af telefonen, skal du udføre en nulstilling af fabriksdata. Når du konfigurerer din telefon efter nulstillingen, har du mulighed for at gendanne data, der blev sikkerhedskopieret på din Google-konto."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Skift indtastningsmetode"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Vælg skærmlås"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Vælg backuplås"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Tilslutter"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Tilsluttet"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Tilgængelig"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"I brug"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Skærmindstillinger"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Vil du afbryde forbindelsen?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Dette vil afslutte din forbindelse til:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Fra"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Utilgængelig, fordi NFC er slukket"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Når denne funktion er slået til, kan du overføre appindhold til en anden NFC-kompatibel enhed ved at holde enhederne tæt sammen. For eksempel kan du overføre browsersider, YouTube-videoer, kontaktpersoner og meget mere."\n\n"Hold blot enhederne tæt sammen (typisk ryg mod ryg), og tryk derefter på din skærm. Appen afgør, hvad der bliver overført."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Når denne funktion er slået til, kan du overføre appindhold til en anden NFC-kompatibel enhed ved at holde enhederne tæt sammen. For eksempel kan du overføre browsersider, YouTube-videoer, kontaktpersoner og meget mere.\n\nHold blot enhederne tæt sammen (typisk ryg mod ryg), og tryk derefter på din skærm. Appen afgør, hvad der bliver overført."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Registrering af netværkstjeneste"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Tillad, at apps på andre enheder kan finde apps på denne enhed"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"For at kunne angive mere nøjagtig placering og af andre grunde, ønsker <xliff:g id="APP_NAME">%1$s</xliff:g> at aktivere netværksscanning, selv når Wi-Fi er deaktiveret."\n\n"Vil du tillade dette for alle apps, der ønsker at scanne?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"For at kunne angive mere nøjagtig placering og af andre grunde, ønsker <xliff:g id="APP_NAME">%1$s</xliff:g> at aktivere netværksscanning, selv når Wi-Fi er deaktiveret.\n\nVil du tillade dette for alle apps, der ønsker at scanne?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillad"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Afvis"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Forbind"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"ADVARSEL! Du kan blive udsat for ekstraudgifter til mobilselskabet.\n\nKonfiguration af tabletten kan kræve en betydelig mængde aktivitet på netværket."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ADVARSEL! Du kan blive udsat for ekstraudgifter til mobilselskabet.\n\nKonfiguration af telefonen kan kræve en betydelig mængde aktivitet på netværket."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ADVARSEL! Din tablet kan ikke bekræfte, at din software er opdateret, før du har forbindelse til internettet."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ADVARSEL! Telefonen kan ikke bekræfte, at din software er opdateret, før du har forbindelse til internettet."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tabletten kunne ikke oprette forbindelse til dette Wi-Fi-netværk."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN-kode til SIM-kort"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Forkert pinkode"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Pinkoderne er ikke ens"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Pinkoden kan ikke ændres."\n"Pinkoden er muligvis forkert."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Pinkoden kan ikke ændres.\nPinkoden er muligvis forkert."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN-koden til SIM-kortet er ændret"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM-kortlåsens tilstand kan ikke ændres."\n"Det skyldes muligvis en forkert pinkode."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM-kortlåsens tilstand kan ikke ændres.\nDet skyldes muligvis en forkert pinkode."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Annuller"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status for tabletcomputeren"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Gendannelse af fabriksdata"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Sletter alle data på tabletcomputeren"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Slet alle data på telefonen"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Dette sletter alle data fra tablettens "<b>"interne lager"</b>", f.eks.: "\n\n<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og applikationer"</li>\n<li>"downloadede applikationer"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Dette sletter alle data fra telefonens "<b>"interne lager"</b>", f.eks.: "\n\n<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og applikationer"</li>\n<li>"downloadede applikationer"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er i øjeblikket logget ind på disse konti:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Dette sletter alle data fra tablettens "<b>"interne lager"</b>", f.eks.: \n\n"<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og applikationer"</li>\n<li>"downloadede applikationer"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Dette sletter alle data fra telefonens "<b>"interne lager"</b>", f.eks.: \n\n"<li>"din Google-konto"</li>\n<li>"data og indstillinger for system og applikationer"</li>\n<li>"downloadede applikationer"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er i øjeblikket logget ind på disse konti:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Billeder"</li>\n<li>"Andre brugerdata"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ryd musik, billeder og andre brugerdata ved at formatere "<b>"USB-lager"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Hvis du vil rydde musik, billeder og andre brugerdata, skal du formatere "<b>"SD-kortet"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Cachelagrede processer"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Nulstil app-præferencer"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Nulstil app-præferencer?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Dette vil nulstille alle præferencer for:"\n\n<li>"deaktiverede apps"</li>\n<li>"underretninger om deaktiverede apps"</li>\n<li>"standardapplikationer til handlinger"</li>\n<li>"begrænsninger for baggrundsdata for apps"</li>\n\n"Du vil ikke miste nogen appdata."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Dette vil nulstille alle præferencer for:\n\n"<li>"deaktiverede apps"</li>\n<li>"underretninger om deaktiverede apps"</li>\n<li>"standardapplikationer til handlinger"</li>\n<li>"begrænsninger for baggrundsdata for apps"</li>\n\n"Du vil ikke miste nogen appdata."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Nulstil apps"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Administrer plads"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Tryk på Ctrl-Mellemrum for at skifte"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Standard"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tastaturlayout"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Brugerordbog"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Personlig ordbog"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Personlige ordbøger"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Personlig ordbog"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Tilføj"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Føj til ordbog"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Gør det muligt at rapportere fejl i menuen til startknappen"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Undgå dvale"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skærmen går ikke i dvale under opladning"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktivér Bluetooth HCI snoop log"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Gem alle Bluetooth HCI-pakker i en fil"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Vælg kørsel"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Vælg kørsel"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Genstart for at skifte kørsel fra <xliff:g id="OLD">%1$s</xliff:g> til <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Imiterede placeringer"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillad imiterede placeringer"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Vil du tillade USB-fejlretning?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Beskyt USB-lageret"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apps skal anmode om tilladelse til at læse USB-lageret"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Vil du beskytte USB-lageret?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Når USB-lageret er beskyttet, skal apps anmode om tilladelse til at læse data fra et eksternt lager."\n\n" Nogle apps fungerer muligvis ikke, før de opdateres af deres udviklere."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Når USB-lageret er beskyttet, skal apps anmode om tilladelse til at læse data fra et eksternt lager.\n\n Nogle apps fungerer muligvis ikke, før de opdateres af deres udviklere."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Beskyt SD-kortet"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apps skal anmode om tilladelse til at læse SD-kortet"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vil du beskytte SD-kortet?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Når SD-kortet er beskyttet, skal apps anmode om tilladelse til at læse data fra et eksternt lager."\n\n"Nogle apps fungerer muligvis ikke, før de opdateres af deres udviklere."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Når SD-kortet er beskyttet, skal apps anmode om tilladelse til at læse data fra et eksternt lager.\n\nNogle apps fungerer muligvis ikke, før de opdateres af deres udviklere."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokal terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Aktivér terminalappen, der giver lokal shell-adgang"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Vælg gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Vælg widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vil du oprette en widget og tillade adgang?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Tjenester"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</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_screen_magnification_summary" msgid="2380627654189671754">"Når denne funktion er slået til, kan du zoome ind og ud ved at trykke tre gange på skærmen.\n\nMens der er zoomet ind, kan du:\n"<ul><li>"panorere: Træk to eller flere fingre hen over skærmen."</li>\n<li>"justere zoomniveauet: Knib to eller flere fingre sammen, eller spred dem fra hinanden."</li></ul>\n\n"Du kan også midlertidigt forstørre, hvad der er under din finger, ved at trykke tre gange og holde fingeren på skærmen. I denne forstørrede tilstand, kan du trække fingeren for at udforske forskellige dele af skærmen. Løft fingeren for at vende tilbage til din forrige tilstand.\n\nBemærk! Du kan forstørre ved at trykke tre gange overalt undtagen på tastaturet og i navigationslinjen."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Tilgængelighedsgenvej"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Til"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Fra"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Når denne funktion er slået til, kan du hurtigt aktivere tilgænglighedsfunktioner i to trin:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Når denne funktion er slået til, kan du hurtigt aktivere tilgænglighedsfunktioner i to trin:\n\nTrin 1: Tryk på afbryderknappen, og hold den nede, indtil du hører en lyd eller mærker en vibration.\n\nTrin 2: Tryk med to fingre, og hold nede, indtil du hører bekræftelseslyden.\n\nHvis enheden har flere brugere, aktiverer brug af denne genvej midlertidigt adgang, indtil enheden låses op."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Stor tekst"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Skærmforstørrelse"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Opdater skærmforstørrelse automatisk"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack giver talefeedback for at hjælpe blinde og svagtseende brugere. Vil du installere det gratis fra Android Marked?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ingen beskrivelse til rådighed."</string>
     <string name="settings_button" msgid="3006713718908152930">"Indstillinger"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Udskrivning"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Indstillinger for udskrivning"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Tjenester"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vil du bruge <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> kan modtage dokumenter, du udskriver. Sådanne dokumenter kan indeholde følsomme oplysninger."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Der er ikke installeret nogen tjenester"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Indstillinger"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Tilføj printere"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Til"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Fra"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Hvad der har brugt batteriet"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Batteribrugsdata utilgængeligt."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi aktiv"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Data sendt"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Data modtaget"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Mobildata blev sendt"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Mobildata blev modtaget"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Wi-Fi-data blev sendt"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Wi-Fi-data blev modtaget"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Lyd"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tid til"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonehøjde"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Påvirker tonen af den talte tekst"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Sprog"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Der er ikke valgt sprog"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Angiver det sprog, der skal bruges til oplæsning af tekst"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Lyt til et eksempel"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Afspil en kort demonstration af talesyntese"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP understøttes ikke."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Du kan ikke konfigurere en EAP-Wi-Fi-forbindelse under konfigurationen. Efter konfigurationen kan du gøre dette i Indstillinger &gt; Trådløst og netværk."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Oprettelsen kan tage et par minutter..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Tryk på "<b>"Næste"</b>" for at fortsætte med konfigurationen."\n\n" Tryk på "<b>"Tilbage"</b>" for at oprette forbindelse til et andet Wi-Fi-netværk."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Tryk på "<b>"Næste"</b>" for at fortsætte med konfigurationen.\n\n Tryk på "<b>"Tilbage"</b>" for at oprette forbindelse til et andet Wi-Fi-netværk."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronisering aktiveret"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sync deaktiveret"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Synkroniseringsfejl."</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Ret GPU-overlapsfejl"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Deaktiver HW-overlejring"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Brug altid GPU til skærmsammensætning"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktivér OpenGL-spor"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Deaktiver baggrundsdata på mobilnetværk. Netværk, som ikke er mobilnetværk, vil blive brugt, hvis de er tilgængelige."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Hvis du vil begrænse baggrundsdata for denne app, skal du først angive en mobildatagrænse."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Vil du begrænse baggrundsdata?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Denne funktion kan medføre, at en app, der er afhængig af baggrundsdata, ikke længere fungerer, når der kun er mobilnetværk til rådighed."\n\n"Du kan finde mere hensigtsmæssige metoder til kontrol af dataforbruget i de indstillinger, der er tilgængelige i selve appen."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Denne funktion kan medføre, at en app, der er afhængig af baggrundsdata, ikke længere fungerer, når der kun er mobilnetværk til rådighed.\n\nDu kan finde mere hensigtsmæssige metoder til kontrol af dataforbruget i de indstillinger, der er tilgængelige i selve appen."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Begrænsning af baggrundsdata er kun muligt, hvis du har angivet en grænse for mobildata."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Slå aut. synk. af data til?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Alle ændringer, som du foretager på dine konti på nettet, vil automatisk blive kopieret til din tablet."\n\n" Der vil muligvis også være nogle konti, hvor de ændringer, du foretager på telefonen, automatisk kopieres til internettet. Sådan fungerer en Google-konto."\n\n"Du kan vælge, hvilke former for oplysninger, der skal synkroniseres på hver konto, ved at gå til Indstillinger &gt; Konti."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Alle ændringer, som du foretager på dine konti på nettet, vil automatisk blive kopieret til din telefon."\n\n" Der vil muligvis også være nogle konti, hvor de ændringer, du foretager på telefonen, automatisk kopieres til internettet. Sådan fungerer en Google-konto."\n\n"Du kan vælge, hvilke former for oplysninger, der skal synkroniseres på hver konto, ved at gå til Indstillinger &gt; Konti."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Alle ændringer, som du foretager på dine konti på nettet, vil automatisk blive kopieret til din tablet.\n\n Der vil muligvis også være nogle konti, hvor de ændringer, du foretager på telefonen, automatisk kopieres til internettet. Sådan fungerer en Google-konto.\n\nDu kan vælge, hvilke former for oplysninger, der skal synkroniseres på hver konto, ved at gå til Indstillinger &gt; Konti."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Alle ændringer, som du foretager på dine konti på nettet, vil automatisk blive kopieret til din telefon.\n\n Der vil muligvis også være nogle konti, hvor de ændringer, du foretager på telefonen, automatisk kopieres til internettet. Sådan fungerer en Google-konto.\n\nDu kan vælge, hvilke former for oplysninger, der skal synkroniseres på hver konto, ved at gå til Indstillinger &gt; Konti."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Slå aut. synk. af data fra?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Dette vil sænke data- og batteriforbruget, men du skal til gengæld synkronisere hver konto manuelt for at hente de seneste oplysninger, og du vil ikke modtage underretninger, når der kommer nye opdateringer."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Dato for nulstilling af forbrugsperiode"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Angiv en advarsel om dataforbrug"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Angiv en grænse for dataforbrug"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Grænse for dataforbrug"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Din mobildataforbindelse deaktiveres, når den angivne grænse er nået."\n\n"Da dataforbrug måles af din tablet, og dit mobilselskab muligvis bruger en anden metode til beregning af forbrug, kan du overveje at angive en lav grænse."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Din mobildataforbindelse deaktiveres, når den angivne grænse er nået."\n\n"Da dataforbrug måles af din telefon, og dit mobilselskab muligvis bruger en anden metode til beregning af forbrug, kan du overveje at angive en lav grænse."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Din mobildataforbindelse deaktiveres, når den angivne grænse er nået.\n\nDa dataforbrug måles af din tablet, og dit mobilselskab muligvis bruger en anden metode til beregning af forbrug, kan du overveje at angive en lav grænse."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Din mobildataforbindelse deaktiveres, når den angivne grænse er nået.\n\nDa dataforbrug måles af din telefon, og dit mobilselskab muligvis bruger en anden metode til beregning af forbrug, kan du overveje at angive en lav grænse."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vil du begrænse baggrundsdata?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Hvis du begrænser mobildata, der kører i baggrunden, vil nogle apps og tjenester ikke fungere, medmindre du har forbindelse til et Wi-Fi-netværk."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Hvis du begrænser mobildata, der kører i baggrunden, vil nogle apps og tjenester ikke fungere, hvis du ikke har forbindelse til et Wi-Fi-netværk."\n\n"Denne indstilling påvirker alle brugere på denne tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Hvis du begrænser mobildata, der kører i baggrunden, vil nogle apps og tjenester ikke fungere, hvis du ikke har forbindelse til et Wi-Fi-netværk."\n\n"Denne indstilling påvirker alle brugere på denne telefon."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Hvis du begrænser mobildata, der kører i baggrunden, vil nogle apps og tjenester ikke fungere, hvis du ikke har forbindelse til et Wi-Fi-netværk.\n\nDenne indstilling påvirker alle brugere på denne tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Hvis du begrænser mobildata, der kører i baggrunden, vil nogle apps og tjenester ikke fungere, hvis du ikke har forbindelse til et Wi-Fi-netværk.\n\nDenne indstilling påvirker alle brugere på denne telefon."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"advarsel"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"grænse"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Fjernede apps"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Bruger"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Begrænset profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Tilføj ny bruger"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Du kan dele denne enhed med andre personer ved at oprette yderligere brugere. Hver bruger har deres egen plads, som de kan tilpasse med deres egne apps, baggrunde osv. Brugerne kan også ændre indstillinger på tabletten, der påvirker alle, f.eks. indstillinger for Wi-Fi."\n\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_add_user_message_long" msgid="3086244205384741788">"Du kan dele denne enhed med andre personer ved at oprette yderligere brugere. Hver bruger har deres egen plads, som de kan tilpasse med deres egne apps, baggrunde osv. Brugerne kan også ændre indstillinger på tabletten, der påvirker alle, f.eks. indstillinger for Wi-Fi.\n\nNår du opretter en ny bruger, skal denne person gennemgå en oprettelsesproces.\n\nAlle brugere kan acceptere opdaterede apptilladelser på vegne af alle andre brugere."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Når du opretter en ny bruger, skal denne person gennemgå en oprettelsesproces.\n\nAlle brugere kan acceptere opdaterede apptilladelser på vegne af alle andre brugere."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Vil du konfigurere brugeren nu?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Sørg for, at personen kan tage tabletten og etablere deres plads"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Vil du oprette en profil nu?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Denne indstilling påvirker alle brugere på denne telefon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Skift sprog"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Skift skriftstørrelse"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Begrænsninger"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Fjern begrænsninger"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Skift pinkode"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Vis meddelelser"</string>
     <string name="help_label" msgid="1107174367904110532">"Hjælp"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Konto til indhold"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 9035730ed66..19b3de5d082 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Standort"</item>
     <item msgid="255608127647030286">"Persönlich"</item>
     <item msgid="4588829735729884491">"SMS/MMS"</item>
-    <item msgid="8971765125227378270">"Gerät"</item>
+    <item msgid="886742181977884584">"Medien"</item>
+    <item msgid="7924928667052300589">"Gerät"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"Ungefährer Standort"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"Audio wiedergeben"</item>
     <item msgid="8374996688066472414">"Zwischenablage lesen"</item>
     <item msgid="3045529469061083747">"Zwischenablage ändern"</item>
+    <item msgid="5124443975763747838">"Medienschaltflächen"</item>
+    <item msgid="4547883971364273343">"Audiofokus"</item>
+    <item msgid="2603878814882344450">"Gesamtlautstärke"</item>
+    <item msgid="7136963238377062018">"Sprachlautstärke"</item>
+    <item msgid="4270236897655923007">"Klingeltonlautstärke"</item>
+    <item msgid="6325739889222559394">"Medienlautstärke"</item>
+    <item msgid="5762123934816216821">"Weckerlautstärke"</item>
+    <item msgid="785049718065337473">"Benachrichtigungslautstärke"</item>
+    <item msgid="6700305533746877052">"Bluetooth-Lautstärke"</item>
+    <item msgid="2029227495214047094">"aktiv lassen"</item>
+    <item msgid="26109888160231211">"Standort beobachten"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Standort"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Audio wiedergeben"</item>
     <item msgid="136815868796597058">"Zwischenablage lesen"</item>
     <item msgid="5238692940326972503">"Zwischenablage ändern"</item>
+    <item msgid="5753789168376302997">"Medienschaltflächen"</item>
+    <item msgid="3265262911688671938">"Audiofokus"</item>
+    <item msgid="2098976479485046797">"Gesamtlautstärke"</item>
+    <item msgid="5660213838861789350">"Sprachlautstärke"</item>
+    <item msgid="7983336752371254444">"Klingeltonlautstärke"</item>
+    <item msgid="7878027809189330917">"Medienlautstärke"</item>
+    <item msgid="7260546305036218513">"Weckerlautstärke"</item>
+    <item msgid="9103719301075748925">"Benachrichtigungslautstärke"</item>
+    <item msgid="7025966722295861512">"Bluetooth-Lautstärke"</item>
+    <item msgid="4665183401128289653">"Aktiv lassen"</item>
+    <item msgid="8584357129746649222">"Standort"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kurz"</item>
     <item msgid="2560532955514699713">"Mittel"</item>
     <item msgid="2372711992605524591">"Lang"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (Debug)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Dalvik verwenden"</item>
+    <item msgid="5131846588686178907">"ART verwenden"</item>
+    <item msgid="4530003713865319928">"ART-Debug-Build verwenden"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nie prüfen"</item>
     <item msgid="6042769699089883931">"Nur auf DRM-Inhalte prüfen"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Auf Bildschirm als Linien"</item>
     <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Aus"</item>
+    <item msgid="7688197031296835369">"Überschneidungsbereiche anzeigen"</item>
+    <item msgid="8332661909019981149">"Überschneidungszähler anzeigen"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardlimit"</item>
     <item msgid="4071574792028999443">"Keine Hintergrundprozesse"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 021ef10149f..ec67e56cc8d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -275,8 +275,8 @@
     <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 Daten-Roaming zulassen, können hohe Roaming-Gebühren anfallen!"</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Wenn Sie Daten-Roaming zulassen, können erhebliche Roaming-Gebühren entstehen."\n\n"Diese Einstellung betrifft alle Nutzer auf diesem Tablet."</string>
-    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Wenn Sie Daten-Roaming zulassen, können erhebliche Roaming-Gebühren entstehen."\n\n"Diese Einstellung betrifft alle Nutzer auf diesem Telefon."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Wenn Sie Daten-Roaming zulassen, können erhebliche Roaming-Gebühren entstehen.\n\nDiese Einstellung betrifft alle Nutzer auf diesem Tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Wenn Sie Daten-Roaming zulassen, können erhebliche Roaming-Gebühren entstehen.\n\nDiese Einstellung betrifft alle Nutzer auf diesem Telefon."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Daten-Roaming zulassen?"</string>
     <string name="networks" msgid="6333316876545927039">"Netzbetreiberauswahl"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Netzbetreiber auswählen"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Numerische PIN oder Passwort festlegen, mit dem das Tablet beim Einschalten entschlüsselt werden muss"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Numerische PIN oder Passwort festlegen, mit dem das Telefon beim Einschalten entschlüsselt werden muss"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Verschlüsselt"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps mit den dazugehörigen Daten sowie Multimedia- und andere Dateien verschlüsseln. Nach der Verschlüsselung Ihres Tablets ist bei jedem Einschalten die Eingabe einer PIN-Nummer oder eines Passworts erforderlich. Sie können die Verschlüsselung Ihres Tablets nur aufheben, indem Sie das Gerät auf die Werkseinstellungen zurücksetzen. Dabei werden alle Ihre Daten gelöscht."\n\n"Die Verschlüsselung dauert mindestens eine Stunde. Vergewissern Sie sich zu Beginn, dass Ihr Akku vollständig geladen ist, und lassen Sie Ihr Tablet angeschlossen, bis die Verschlüsselung abgeschlossen ist. Eine Unterbrechung dieses Vorgangs kann zu teilweisem oder vollständigem Datenverlust führen."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps mit den dazugehörigen Daten sowie Multimedia- und andere Dateien verschlüsseln. Nach der Verschlüsselung Ihres Telefons ist bei jedem Einschalten die Eingabe einer PIN-Nummer oder eines Passworts erforderlich. Sie können die Verschlüsselung Ihres Telefons nur aufheben, indem Sie das Gerät auf die Werkseinstellungen zurücksetzen. Dabei werden alle Ihre Daten gelöscht."\n\n"Die Verschlüsselung dauert mindestens eine Stunde. Vergewissern Sie sich zu Beginn, dass Ihr Akku vollständig geladen ist, und lassen Sie Ihr Telefon angeschlossen, bis die Verschlüsselung abgeschlossen ist. Eine Unterbrechung dieses Vorgangs kann zu teilweisem oder vollständigem Datenverlust führen."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps mit den dazugehörigen Daten sowie Multimedia- und andere Dateien verschlüsseln. Nach der Verschlüsselung Ihres Tablets ist bei jedem Einschalten die Eingabe einer PIN-Nummer oder eines Passworts erforderlich. Sie können die Verschlüsselung Ihres Tablets nur aufheben, indem Sie das Gerät auf die Werkseinstellungen zurücksetzen. Dabei werden alle Ihre Daten gelöscht.\n\nDie Verschlüsselung dauert mindestens eine Stunde. Vergewissern Sie sich zu Beginn, dass Ihr Akku vollständig geladen ist, und lassen Sie Ihr Tablet angeschlossen, bis die Verschlüsselung abgeschlossen ist. Eine Unterbrechung dieses Vorgangs kann zu teilweisem oder vollständigem Datenverlust führen."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps mit den dazugehörigen Daten sowie Multimedia- und andere Dateien verschlüsseln. Nach der Verschlüsselung Ihres Telefons ist bei jedem Einschalten die Eingabe einer PIN-Nummer oder eines Passworts erforderlich. Sie können die Verschlüsselung Ihres Telefons nur aufheben, indem Sie das Gerät auf die Werkseinstellungen zurücksetzen. Dabei werden alle Ihre Daten gelöscht.\n\nDie Verschlüsselung dauert mindestens eine Stunde. Vergewissern Sie sich zu Beginn, dass Ihr Akku vollständig geladen ist, und lassen Sie Ihr Telefon angeschlossen, bis die Verschlüsselung abgeschlossen ist. Eine Unterbrechung dieses Vorgangs kann zu teilweisem oder vollständigem Datenverlust führen."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tablet verschlüsseln"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefon verschlüsseln"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laden Sie Ihren Akku auf und versuchen Sie es erneut."</string>
@@ -339,8 +339,8 @@
     <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">"Passwort eingeben"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Verschlüsselung fehlgeschlagen"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Daher ist der Zugriff auf die Daten auf Ihrem Tablet nicht mehr möglich. "\n\n"Damit Sie Ihr Tablet wieder verwenden können, müssen Sie es auf die Werkseinstellungen zurücksetzen. Wenn Sie Ihr Tablet nach dem Zurücksetzen wieder einrichten, können Sie gegebenenfalls Daten, die gesichert wurden, in Ihrem Google-Konto wiederherstellen."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Daher ist der Zugriff auf die Daten auf Ihrem Telefon nicht mehr möglich. "\n\n"Damit Sie Ihr Telefon wieder verwenden können, müssen Sie es auf die Werkseinstellungen zurücksetzen. Wenn Sie Ihr Telefon nach dem Zurücksetzen wieder einrichten, können Sie gegebenenfalls Daten, die gesichert wurden, in Ihrem Google-Konto wiederherstellen."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Daher ist der Zugriff auf die Daten auf Ihrem Tablet nicht mehr möglich. \n\nDamit Sie Ihr Tablet wieder verwenden können, müssen Sie es auf die Werkseinstellungen zurücksetzen. Wenn Sie Ihr Tablet nach dem Zurücksetzen wieder einrichten, können Sie gegebenenfalls Daten, die gesichert wurden, in Ihrem Google-Konto wiederherstellen."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Die Verschlüsselung wurde unterbrochen und kann nicht abgeschlossen werden. Daher ist der Zugriff auf die Daten auf Ihrem Telefon nicht mehr möglich. \n\nDamit Sie Ihr Telefon wieder verwenden können, müssen Sie es auf die Werkseinstellungen zurücksetzen. Wenn Sie Ihr Telefon nach dem Zurücksetzen wieder einrichten, können Sie gegebenenfalls Daten, die gesichert wurden, in Ihrem Google-Konto wiederherstellen."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Eingabemethode wechseln"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Display-Sperre wählen"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Ersatzsperre wählen"</string>
@@ -515,6 +515,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Verbindung wird hergestellt..."</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Verbunden"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Verfügbar"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"In Verwendung"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Display-Einstellungen"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Verbindung trennen?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Hierdurch wird die Verbindung mit&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; getrennt."</string>
@@ -533,7 +534,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Aus"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nicht verfügbar, weil NFC deaktiviert ist"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Wenn diese Funktion aktiviert ist, können Sie App-Inhalte auf ein anderes NFC-fähiges Gerät beamen, indem Sie die Geräte dicht nebeneinander halten. Sie können beispielsweise Browserseiten, YouTube-Videos und Kontakte beamen."\n\n"Halten Sie die Geräte einfach dicht nebeneinander, am besten Rückseite an Rückseite, und berühren Sie den Bildschirm. Die App bestimmt, was übertragen wird."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Wenn diese Funktion aktiviert ist, können Sie App-Inhalte auf ein anderes NFC-fähiges Gerät beamen, indem Sie die Geräte dicht nebeneinander halten. Sie können beispielsweise Browserseiten, YouTube-Videos und Kontakte beamen.\n\nHalten Sie die Geräte einfach dicht nebeneinander, am besten Rückseite an Rückseite, und berühren Sie den Bildschirm. Die App bestimmt, was übertragen wird."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Diensterkennung"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Ermöglicht Apps auf anderen Geräten, Apps auf diesem Gerät zu erkennen"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"WLAN"</string>
@@ -621,7 +622,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Gesichert mit <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", gesichert mit <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Keine"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Zur Verbesserung der Standortgenauigkeit und zu anderen Zwecken möchte <xliff:g id="APP_NAME">%1$s</xliff:g> die Netzwerküberprüfung aktivieren, auch wenn das WLAN deaktiviert ist."\n\n"Möchten Sie dies für alle Apps zulassen, die eine Überprüfung durchführen möchten?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Zur Verbesserung der Standortgenauigkeit und zu anderen Zwecken möchte <xliff:g id="APP_NAME">%1$s</xliff:g> die Netzwerküberprüfung aktivieren, auch wenn das WLAN deaktiviert ist.\n\nMöchten Sie dies für alle Apps zulassen, die eine Überprüfung durchführen möchten?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Zulassen"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Ablehnen"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Verbinden"</string>
@@ -633,8 +634,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"Achtung: Es können zusätzliche Kosten für die Datenübertragung vonseiten des Mobilfunkanbieters anfallen.\n\nDas Einrichten des Tablets kann eine erhöhte Netzwerkaktivität erfordern."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"Achtung: Es können zusätzliche Kosten für die Datenübertragung vonseiten des Mobilfunkanbieters anfallen.\n\nDas Einrichten des Telefons kann eine erhöhte Netzwerkaktivität erfordern."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"Achtung: Das Tablet kann erst überprüfen, ob Ihre Software aktuell ist, wenn eine Internetverbindung besteht."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"Achtung: Das Telefon kann erst überprüfen, ob Ihre Software aktuell ist, wenn eine Internetverbindung besteht."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Das Tablet konnte nicht auf dieses WLAN zugreifen."</string>
@@ -774,9 +775,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN für SIM-Karte"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Falsche PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Die PINs stimmen nicht überein."</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"PIN kann nicht geändert werden."\n"Möglicherweise ist es die falsche PIN."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"PIN kann nicht geändert werden.\nMöglicherweise ist es die falsche PIN."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-PIN erfolgreich geändert"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Status der SIM-Kartensperrung kann nicht geändert werden."\n"Möglicherweise falsche PIN."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Status der SIM-Kartensperrung kann nicht geändert werden.\nMöglicherweise falsche PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Abbrechen"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tablet-Status"</string>
@@ -837,7 +838,7 @@
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD-Karte entnehmen"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Internen USB-Speicher trennen"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"SD-Karte trennen, damit Sie sie sicher entfernen können"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"USB-Sp. für Bereitst. einlegen"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"USB-Speicher für Bereitst. einlegen"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"SD-Karte zur Bereitstellung einlegen"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"USB-Speicher bereitst."</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"SD-Karte bereitstellen"</string>
@@ -919,9 +920,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Auf Werkszustand zurück"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Löscht alle Daten auf dem Tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Löscht alle Daten auf dem Telefon"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" Ihres Tablets gelöscht, u. a."\n\n<li>"Ihr Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"Heruntergeladene Apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" Ihres Telefons gelöscht, u. a."\n\n<li>"Ihr Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"Heruntergeladene Apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Sie sind zurzeit in folgenden Konten angemeldet:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" Ihres Tablets gelöscht, u. a.\n\n"<li>"Ihr Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"Heruntergeladene Apps"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" Ihres Telefons gelöscht, u. a.\n\n"<li>"Ihr Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"Heruntergeladene Apps"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Sie sind zurzeit in folgenden Konten angemeldet:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Fotos"</li>\n<li>"Sonstige Nutzerdaten"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss der "<b>"USB-Speicher"</b>" gelöscht werden."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss die "<b>"SD-Karte"</b>" gelöscht werden."</string>
@@ -1106,7 +1107,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Prozesse im Cache anzeigen"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"App-Einstell. zurücksetzen"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"App-Einstellungen zurücksetzen?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Hierdurch werden alle Einstellungen zurückgesetzt für:"\n\n" "<li>"Deaktivierte Apps"</li>\n" "<li>"Deaktivierte App-Benachrichtigungen"</li>\n" "<li>"Standard-Apps für Aktionen"</li>\n" "<li>"Hintergrunddatenbeschränkungen für Apps"</li>\n\n" Es gehen Ihnen keine App-Daten verloren."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Hierdurch werden alle Einstellungen zurückgesetzt für:\n\n "<li>"Deaktivierte Apps"</li>\n" "<li>"Deaktivierte App-Benachrichtigungen"</li>\n" "<li>"Standard-Apps für Aktionen"</li>\n" "<li>"Hintergrunddatenbeschränkungen für Apps"</li>\n\n" Es gehen Ihnen keine App-Daten verloren."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Apps zurücksetzen"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Speicherplatz verwalten"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -1179,7 +1180,7 @@
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Von Apps verwendeten Speicher anzeigen"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktive Dienste"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Momentan ausgeführte Dienste anzeigen und steuern"</string>
-    <string name="service_restarting" msgid="2242747937372354306">"Neustart wird durchgeführt."</string>
+    <string name="service_restarting" msgid="2242747937372354306">"Neustart wird durchgeführt..."</string>
     <string name="cached" msgid="1059590879740175019">"Hintergrundprozess im Cache"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Nichts wird ausgeführt."</string>
     <string name="service_started_by_app" msgid="818675099014723551">"Von der App gestartet"</string>
@@ -1241,9 +1242,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Drücken Sie zum Wechseln Strg+Leertaste."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Standard"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tastaturlayouts"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Mein Wörterbuch"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Mein Wörterbuch"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Persönliche Wörterbücher"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Mein Wörterbuch"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Hinzufügen"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Ins Wörterbuch"</string>
@@ -1304,6 +1303,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Fügt die Option für den Fehlerbericht im Menü \"Akku\" hinzu"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Aktiv lassen"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Display wird beim Laden nie in den Ruhezustand versetzt"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI-Snoop-Protokoll aktivieren"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Alle Bluetooth HCI-Pakete in einer Datei erfassen"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Laufzeit auswählen"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Laufzeit auswählen"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Neu starten, um Laufzeit von <xliff:g id="OLD">%1$s</xliff:g> zu <xliff:g id="NEW">%2$s</xliff:g> zu ändern?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Falsche Standorte"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Falsche Standorte zulassen"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB-Debugging zulassen?"</string>
@@ -1316,11 +1320,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USB-Speicher schützen"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apps benötigen die Berechtigung zum Lesen des USB-Speichers"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"USB-Speicher schützen?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Wenn der USB-Speicher geschützt ist, benötigen Apps die Berechtigung zum Lesen von Daten aus dem externen Speicher."\n\n"Einige Apps funktionieren eventuell erst nach der Aktualisierung durch ihre Entwickler."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Wenn der USB-Speicher geschützt ist, benötigen Apps die Berechtigung zum Lesen von Daten aus dem externen Speicher.\n\nEinige Apps funktionieren eventuell erst nach der Aktualisierung durch ihre Entwickler."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"SD-Karte schützen"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apps benötigen die Berechtigung zum Lesen der SD-Karte"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SD-Karte schützen?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wenn die SD-Karte geschützt ist, benötigen Apps die Berechtigung zum Lesen von Daten aus dem externen Speicher."\n\n"Einige Apps funktionieren eventuell erst nach der Aktualisierung durch ihre Entwickler."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wenn die SD-Karte geschützt ist, benötigen Apps die Berechtigung zum Lesen von Daten aus dem externen Speicher.\n\nEinige Apps funktionieren eventuell erst nach der Aktualisierung durch ihre Entwickler."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokales Terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Terminal-App mit Zugriff auf lokale Shell aktivieren"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Gadget auswählen"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Widget auswählen"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Widget erstellen und Zugriff erlauben?"</string>
@@ -1341,11 +1347,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Dienste"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</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_screen_magnification_summary" msgid="2380627654189671754">"Wenn diese Funktion aktiviert ist, können Sie heranzoomen und herauszoomen, indem Sie drei Mal auf den Bildschirm tippen.\n\nWenn Sie herangezoomt haben, können Sie:\n"<ul><li>"Schwenken: mindestens 2 Finger über den Bildschirm ziehen"</li>\n<li>"Zoomstufe anpassen: mindestens 2 Finger zusammen- oder auseinanderziehen"</li></ul>\n\n"Sie können auch das, was sich unter Ihrem Finger befindet, vorübergehend vergrößern, indem Sie drei Mal tippen und halten. In diesem vergrößerten Zustand können Sie Ihren Finger ziehen, um verschiedene Bereiche des Bildschirms zu erkunden. Heben Sie Ihren Finger an, um zum vorherigen Zustand zurückzukehren.\n\nHinweis: Das dreimalige Tippen zur Vergrößerung funktioniert überall außer in der Tastatur und in der Navigationsleiste."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Bedienungshilfenverknüpfung"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"An"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Aus"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Wenn diese Funktion aktiviert ist, können Sie Bedienungshilfen schnell in zwei Schritten aktivieren:"\n\n"Schritt 1: Drücken und halten Sie die Ein-/Austaste, bis Sie einen Ton hören oder eine Vibration spüren."\n\n"Schritt 2: Berühren und halten Sie mit zwei Fingern, bis Sie eine Audiobestätigung hören."\n\n"Falls das Gerät mehrere Nutzer hat, werden die Bedienungshilfen durch Verwendung dieser Verknüpfung in der Bildschirmsperre solange aktiviert, bis das Gerät entsperrt ist."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Wenn diese Funktion aktiviert ist, können Sie Bedienungshilfen schnell in zwei Schritten aktivieren:\n\nSchritt 1: Drücken und halten Sie die Ein-/Austaste, bis Sie einen Ton hören oder eine Vibration spüren.\n\nSchritt 2: Berühren und halten Sie mit zwei Fingern, bis Sie eine Audiobestätigung hören.\n\nFalls das Gerät mehrere Nutzer hat, werden die Bedienungshilfen durch Verwendung dieser Verknüpfung in der Bildschirmsperre solange aktiviert, bis das Gerät entsperrt ist."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Großer Text"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Bildschirmvergrößerung"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Vergrößerung autom. aktualisieren"</string>
@@ -1367,6 +1373,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack bietet blinden Nutzern und Nutzern mit eingeschränktem Sehvermögen gesprochenes Feedback. Möchten Sie diese Funktion kostenlos von Android Market installieren?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Es wurde keine Beschreibung bereitgestellt."</string>
     <string name="settings_button" msgid="3006713718908152930">"Einstellungen"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Drucken"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Druckeinstellungen"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Dienste"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> verwenden?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> kann Ihre Druckdokumente empfangen. Diese Dokumente können vertrauliche Daten enthalten."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Keine Dienste installiert"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Einstellungen"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Drucker hinzufügen"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"An"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Aus"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Akku"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Was zum Akkuverbrauch beiträgt"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Keine Daten zum Akkuverbrauch"</string>
@@ -1406,8 +1422,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"WLAN aktiv"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Gesendete Daten"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Empfangene Daten"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Mobildaten gesendet"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Mobildaten empfangen"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"WLAN-Daten gesendet"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"WLAN-Daten empfangen"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Laufzeit"</string>
@@ -1461,6 +1479,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonlage"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Beeinflusst den Klang des gesprochenen Textes"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Sprache"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Keine Sprache ausgewählt"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Legt die sprachspezifische Stimme für den gesprochenen Text fest"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Beispiel anhören"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Kurze Demonstration der Sprachsynthese abspielen"</string>
@@ -1561,7 +1580,7 @@
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Geräteadministrator aktivieren?"</string>
     <string name="add_device_admin" msgid="7133327675884827091">"Aktivieren"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Geräteadministrator"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"Die Aktivierung dieses Administrators ermöglicht der App <xliff:g id="APP_NAME">%1$s</xliff:g>, folgende Vorgänge auszuführen:"</string>
+    <string name="device_admin_warning" msgid="2026747446313628233">"Die Aktivierung dieses Administrators ermöglicht der App \"<xliff:g id="APP_NAME">%1$s</xliff:g>\", folgende Vorgänge auszuführen:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Dieser Administrator ist aktiv und ermöglicht der App <xliff:g id="APP_NAME">%1$s</xliff:g>, folgende Vorgänge auszuführen:"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Unbenannt"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Allgemein"</string>
@@ -1595,7 +1614,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP wird nicht unterstützt."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Während der Einrichtung können Sie keine EAP-WLAN-Verbindung konfigurieren. Sie können dies anschließend in den Einstellungen unter \"Drahtlos &amp;amp Netzwerke\" vornehmen."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Der Verbindungsaufbau kann einige Minuten dauern..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Berühren Sie "<b>"Weiter"</b>", um mit der Einrichtung fortzufahren."\n\n"Tippen Sie auf "<b>"Zurück"</b>", um eine Verbindung zu einem anderen WLAN-Netzwerk herzustellen."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Berühren Sie "<b>"Weiter"</b>", um mit der Einrichtung fortzufahren.\n\nTippen Sie auf "<b>"Zurück"</b>", um eine Verbindung zu einem anderen WLAN-Netzwerk herzustellen."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronisierung aktiviert"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronisierung deaktiviert"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Synchronisierungsfehler"</string>
@@ -1677,8 +1696,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Debugging – GPU-Überschneidung"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW-Overlays deaktivieren"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"GPU immer für Bildschirmaufbau verwenden"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL-Traces aktivieren"</string>
@@ -1739,11 +1757,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Hintergrunddaten in Mobilfunknetzen deaktivieren und sofern verfügbar andere als Mobilfunknetze verwenden"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Legen Sie zur Beschränkung der App-Hintergrunddaten zuerst ein Mobildatenlimit fest."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Hintergrunddaten beschränken?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Diese Funktion kann dazu führen, dass eine auf Hintergrunddaten basierende App nicht mehr funktioniert, wenn nur Mobilfunknetze verfügbar sind."\n\n"Geeignetere Kontrollmechanismen für den Datenverbrauch finden Sie in den Einstellungen der App."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Diese Funktion kann dazu führen, dass eine auf Hintergrunddaten basierende App nicht mehr funktioniert, wenn nur Mobilfunknetze verfügbar sind.\n\nGeeignetere Kontrollmechanismen für den Datenverbrauch finden Sie in den Einstellungen der App."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Hintergrunddaten können nur beschränkt werden, wenn Sie ein Mobilfunklimit festgelegt haben."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Autom. Synchronisierung aktivieren?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Änderungen, die Sie im Web an Ihren Konten vornehmen, werden automatisch auf Ihrem Tablet übernommen."\n\n"Für einige Konten werden möglicherweise auch Änderungen, die Sie auf Ihrem Tablet vornehmen, im Web übernommen. Dies ist die Funktionsweise von Google Konten."\n\n"Unter \"Einstellungen &gt; Konten\" können Sie auswählen, welche Informationen in den einzelnen Konten synchronisiert werden sollen."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Änderungen, die Sie im Web an Ihren Konten vornehmen, werden automatisch auf Ihrem Telefon übernommen."\n\n"Für einige Konten werden eventuell auch Änderungen, die Sie auf Ihrem Telefon vornehmen, im Web übernommen. Dies ist die Funktionsweise von Google Konten."\n\n"Unter \"Einstellungen &gt; Konten\" können Sie auswählen, welche Informationen in den einzelnen Konten synchronisiert werden sollen."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Änderungen, die Sie im Web an Ihren Konten vornehmen, werden automatisch auf Ihrem Tablet übernommen.\n\nFür einige Konten werden möglicherweise auch Änderungen, die Sie auf Ihrem Tablet vornehmen, im Web übernommen. Dies ist die Funktionsweise von Google Konten.\n\nUnter \"Einstellungen &gt; Konten\" können Sie auswählen, welche Informationen in den einzelnen Konten synchronisiert werden sollen."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Änderungen, die Sie im Web an Ihren Konten vornehmen, werden automatisch auf Ihrem Telefon übernommen.\n\nFür einige Konten werden eventuell auch Änderungen, die Sie auf Ihrem Telefon vornehmen, im Web übernommen. Dies ist die Funktionsweise von Google Konten.\n\nUnter \"Einstellungen &gt; Konten\" können Sie auswählen, welche Informationen in den einzelnen Konten synchronisiert werden sollen."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Autom. Synchronisierung deaktivieren?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"So reduzieren Sie den Datenverbrauch und schonen den Akku, müssen jedoch jedes einzelne Konto manuell synchronisieren, um neue Informationen abzurufen. Außerdem erhalten Sie keine Benachrichtigungen, wenn Aktualisierungen erfolgen."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum für Zurücksetzung der Nutzungszyklen"</string>
@@ -1752,12 +1770,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Warnung für Datenverbrauch festlegen"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Limit festlegen"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Datenverbrauch begrenzen"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Ihre mobile Datenverbindung wird deaktiviert, sobald das angegebene Limit erreicht ist."\n\n"Der Datenverbrauch wird von Ihrem Tablet berechnet und kann von der Abrechnung Ihres Mobilfunkanbieters abweichen. Ziehen Sie deshalb die Verwendung eines niedrigen Limits in Betracht."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Ihre mobile Datenverbindung wird deaktiviert, sobald das angegebene Limit erreicht ist."\n\n"Der Datenverbrauch wird von Ihrem Telefon berechnet und kann von der Abrechnung Ihres Mobilfunkanbieters abweichen. Ziehen Sie deshalb die Verwendung eines niedrigen Limits in Betracht."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Ihre mobile Datenverbindung wird deaktiviert, sobald das angegebene Limit erreicht ist.\n\nDer Datenverbrauch wird von Ihrem Tablet berechnet und kann von der Abrechnung Ihres Mobilfunkanbieters abweichen. Ziehen Sie deshalb die Verwendung eines niedrigen Limits in Betracht."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Ihre mobile Datenverbindung wird deaktiviert, sobald das angegebene Limit erreicht ist.\n\nDer Datenverbrauch wird von Ihrem Telefon berechnet und kann von der Abrechnung Ihres Mobilfunkanbieters abweichen. Ziehen Sie deshalb die Verwendung eines niedrigen Limits in Betracht."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Hintergrunddaten beschränken?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Wenn Sie mobile Hintergrunddaten beschränken, funktionieren einige Apps und Dienste nur bei WLAN-Verbindung."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Wenn Sie die mobilen Hintergrunddaten beschränken, funktionieren einige Apps und Dienste nur bei WLAN-Verbindung."\n\n"Diese Einstellung betrifft alle Nutzer auf diesem Tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Wenn Sie die mobilen Hintergrunddaten beschränken, funktionieren einige Apps und Dienste nur bei WLAN-Verbindung."\n\n"Diese Einstellung betrifft alle Nutzer auf diesem Telefon."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Wenn Sie die mobilen Hintergrunddaten beschränken, funktionieren einige Apps und Dienste nur bei WLAN-Verbindung.\n\nDiese Einstellung betrifft alle Nutzer auf diesem Tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Wenn Sie die mobilen Hintergrunddaten beschränken, funktionieren einige Apps und Dienste nur bei WLAN-Verbindung.\n\nDiese Einstellung betrifft alle Nutzer auf diesem Telefon."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"Warnung"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"-Limit"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Entfernte Apps"</string>
@@ -1844,8 +1862,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Nutzer"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Eingeschränkte Profile"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Neuen Nutzer hinzufügen"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Sie können dieses Gerät mit anderen Personen teilen und dazu zusätzliche Nutzer erstellen. Jeder Nutzer hat seinen eigenen Bereich, in dem er unter anderem eigene Apps oder Hintergründe installieren kann. Nutzer können auch Tablet-Einstellungen wie WLAN anpassen, die jeden Nutzer betreffen."\n\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_add_user_message_long" msgid="3086244205384741788">"Sie können dieses Gerät mit anderen Personen teilen und dazu zusätzliche Nutzer erstellen. Jeder Nutzer hat seinen eigenen Bereich, in dem er unter anderem eigene Apps oder Hintergründe installieren kann. Nutzer können auch Tablet-Einstellungen wie WLAN anpassen, die jeden Nutzer betreffen.\n\nNachdem Sie einen neuen Nutzer erstellt haben, muss dieser einen Einrichtungsprozess durchlaufen.\n\nJeder Nutzer kann aktualisierte App-Berechtigungen im Namen aller anderen Nutzer akzeptieren."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Nachdem Sie einen neuen Nutzer erstellt haben, muss dieser einen Einrichtungsprozess durchlaufen.\n\nJeder Nutzer kann aktualisierte App-Berechtigungen im Namen aller anderen Nutzer akzeptieren."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Nutzer jetzt einrichten?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Der Nutzer muss Zugang zu dem Tablet haben und seinen Speicherplatz einrichten."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Profil jetzt einrichten?"</string>
@@ -1876,6 +1894,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Diese Einstellung betrifft alle Nutzer auf diesem Telefon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Sprache ändern"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Schriftgröße ändern"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Einschränkungen"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Einschränkungen aufheben"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN ändern"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Benachrichtigungen zeigen"</string>
     <string name="help_label" msgid="1107174367904110532">"Hilfe"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Konto für Inhalte"</string>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 6a2ceb177ad..e51007eee7a 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Τοποθεσία"</item>
     <item msgid="255608127647030286">"Προσωπικό"</item>
     <item msgid="4588829735729884491">"Ανταλλαγή μηνυμάτων"</item>
-    <item msgid="8971765125227378270">"Συσκευή"</item>
+    <item msgid="886742181977884584">"Μέσα"</item>
+    <item msgid="7924928667052300589">"Συσκευή"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"τοποθεσία κατά προσέγγιση"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"αναπαραγωγή ήχου"</item>
     <item msgid="8374996688066472414">"ανάγνωση περιεχόμενων προχείρου"</item>
     <item msgid="3045529469061083747">"τροποποίηση περιεχομένων προχείρου"</item>
+    <item msgid="5124443975763747838">"κουμπιά μέσων"</item>
+    <item msgid="4547883971364273343">"εστίαση ήχου"</item>
+    <item msgid="2603878814882344450">"κύρια ένταση ήχου"</item>
+    <item msgid="7136963238377062018">"έντασης ήχου φωνής"</item>
+    <item msgid="4270236897655923007">"ένταση ήχου κλήσης"</item>
+    <item msgid="6325739889222559394">"ένταση ήχου μέσων"</item>
+    <item msgid="5762123934816216821">"ένταση ήχου ξυπνητηριού"</item>
+    <item msgid="785049718065337473">"ένταση ήχου ειδοποιήσεων"</item>
+    <item msgid="6700305533746877052">"ένταση ήχου Bluetooth"</item>
+    <item msgid="2029227495214047094">"διατήρηση λειτουργίας"</item>
+    <item msgid="26109888160231211">"παρακολούθηση τοποθεσίας"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Τοποθεσία"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Αναπαραγωγή ήχου"</item>
     <item msgid="136815868796597058">"Ανάγνωση περιεχομένων προχείρου"</item>
     <item msgid="5238692940326972503">"Τροποποίηση περιεχομένων προχείρου"</item>
+    <item msgid="5753789168376302997">"Κουμπιά μέσων"</item>
+    <item msgid="3265262911688671938">"Εστίαση ήχου"</item>
+    <item msgid="2098976479485046797">"Κύρια ένταση ήχου"</item>
+    <item msgid="5660213838861789350">"Έντασης ήχου φωνής"</item>
+    <item msgid="7983336752371254444">"Ένταση ήχου κλήσης"</item>
+    <item msgid="7878027809189330917">"Ένταση ήχου πολυμέσων"</item>
+    <item msgid="7260546305036218513">"Ένταση ήχου ξυπνητηριού"</item>
+    <item msgid="9103719301075748925">"Ένταση ήχου ειδοποιήσεων"</item>
+    <item msgid="7025966722295861512">"Ένταση ήχου Bluetooth"</item>
+    <item msgid="4665183401128289653">"Διατήρηση λειτουργίας"</item>
+    <item msgid="8584357129746649222">"Τοποθεσία"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Σύντομο"</item>
     <item msgid="2560532955514699713">"Μεσαία"</item>
     <item msgid="2372711992605524591">"Παρατεταμένο"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (εντοπισμός σφαλμάτων)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Χρήση Dalvik"</item>
+    <item msgid="5131846588686178907">"Χρήση ART"</item>
+    <item msgid="4530003713865319928">"Χρήση της έκδοσης εντοπισμού σφαλμάτων ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Να μην γίνεται ποτέ έλεγχος"</item>
     <item msgid="6042769699089883931">"Έλεγχος μόνο για περιεχόμενο DRM"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Στην οθόνη ως γραμμές"</item>
     <item msgid="120512413928262547">"Σε adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Ανενεργές"</item>
+    <item msgid="7688197031296835369">"Εμφάνιση περιοχών υπέρβασης"</item>
+    <item msgid="8332661909019981149">"Εμφάνιση μετρητή υπέρβασης"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Τυπικό όριο"</item>
     <item msgid="4071574792028999443">"Δεν υπάρχουν διεργασίες παρασκηνίου"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7eaca177685..6bc8648434e 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -275,8 +275,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_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>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Να απαιτείται ένας αριθμητικός κωδικός PIN ή ένας κωδικός πρόσβασης για την αποκρυπτογράφηση του tablet κάθε φορά που το ενεργοποιείτε"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Να απαιτείται ένας αριθμητικός κωδικός PIN ή ένας κωδικός πρόσβασης για την αποκρυπτογράφηση του τηλεφώνου σας κάθε φορά που το ενεργοποιείτε"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Κρυπτογραφημένο"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Μπορείτε να κρυπτογραφήσετε τους λογαριασμούς, τις ρυθμίσεις, τις εφαρμογές των οποίων έχετε πραγματοποιήσει λήψη και τα δεδομένα τους, τα μέσα και άλλα αρχεία σας. Αφού κρυπτογραφήσετε το tablet σας, θα πρέπει κάθε φορά που το ενεργοποιείτε να πληκτρολογείτε ένα αριθμητικό PIN ή έναν κωδικό πρόσβασης για την αποκρυπτογράφησή του. Δεν είναι δυνατή η αποκρυπτογράφηση του tablet σας, εκτός αν πραγματοποιήσετε επαναφορά εργοστασιακών ρυθμίσεων, διαγράφοντας όλα τα δεδομένα σας."\n\n"Η κρυπτογράφηση διαρκεί μια ώρα ή και περισσότερο. Θα πρέπει να την ξεκινήσετε με την μπαταρία σας φορτισμένη και το tablet σας θα πρέπει να είναι συνδεδεμένο σε πρίζα, έως ότου ολοκληρωθεί η κρυπτογράφηση. Αν διακόψετε τη διαδικασία κρυπτογράφησης, θα χάσετε ορισμένα ή όλα τα δεδομένα σας."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Μπορείτε να κρυπτογραφήσετε τους λογαριασμούς, τις ρυθμίσεις, τις εφαρμογές των οποίων έχετε πραγματοποιήσει λήψη και τα δεδομένα τους, τα μέσα και άλλα αρχεία σας. Αφού κρυπτογραφήσετε το τηλέφωνό σας, θα πρέπει κάθε φορά που το ενεργοποιείτε να πληκτρολογείτε ένα αριθμητικό PIN ή έναν κωδικό πρόσβασης για την αποκρυπτογράφησή του. Δεν είναι δυνατή η αποκρυπτογράφηση του τηλεφώνου σας, εκτός αν πραγματοποιήσετε επαναφορά εργοστασιακών ρυθμίσεων, διαγράφοντας όλα τα δεδομένα σας."\n\n"Η κρυπτογράφηση διαρκεί μια ώρα ή και περισσότερο. Θα πρέπει να την ξεκινήσετε με την μπαταρία σας φορτισμένη, ενώ το τηλέφωνό σας θα πρέπει να είναι συνδεδεμένο σε πρίζα, έως ότου ολοκληρωθεί η κρυπτογράφηση. Αν διακόψετε τη διαδικασία κρυπτογράφησης, θα χάσετε ορισμένα ή όλα τα δεδομένα σας."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Μπορείτε να κρυπτογραφήσετε τους λογαριασμούς, τις ρυθμίσεις, τις εφαρμογές των οποίων έχετε πραγματοποιήσει λήψη και τα δεδομένα τους, τα μέσα και άλλα αρχεία σας. Αφού κρυπτογραφήσετε το tablet σας, θα πρέπει κάθε φορά που το ενεργοποιείτε να πληκτρολογείτε ένα αριθμητικό PIN ή έναν κωδικό πρόσβασης για την αποκρυπτογράφησή του. Δεν είναι δυνατή η αποκρυπτογράφηση του tablet σας, εκτός αν πραγματοποιήσετε επαναφορά εργοστασιακών ρυθμίσεων, διαγράφοντας όλα τα δεδομένα σας.\n\nΗ κρυπτογράφηση διαρκεί μια ώρα ή και περισσότερο. Θα πρέπει να την ξεκινήσετε με την μπαταρία σας φορτισμένη και το tablet σας θα πρέπει να είναι συνδεδεμένο σε πρίζα, έως ότου ολοκληρωθεί η κρυπτογράφηση. Αν διακόψετε τη διαδικασία κρυπτογράφησης, θα χάσετε ορισμένα ή όλα τα δεδομένα σας."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Μπορείτε να κρυπτογραφήσετε τους λογαριασμούς, τις ρυθμίσεις, τις εφαρμογές των οποίων έχετε πραγματοποιήσει λήψη και τα δεδομένα τους, τα μέσα και άλλα αρχεία σας. Αφού κρυπτογραφήσετε το τηλέφωνό σας, θα πρέπει κάθε φορά που το ενεργοποιείτε να πληκτρολογείτε ένα αριθμητικό PIN ή έναν κωδικό πρόσβασης για την αποκρυπτογράφησή του. Δεν είναι δυνατή η αποκρυπτογράφηση του τηλεφώνου σας, εκτός αν πραγματοποιήσετε επαναφορά εργοστασιακών ρυθμίσεων, διαγράφοντας όλα τα δεδομένα σας.\n\nΗ κρυπτογράφηση διαρκεί μια ώρα ή και περισσότερο. Θα πρέπει να την ξεκινήσετε με την μπαταρία σας φορτισμένη, ενώ το τηλέφωνό σας θα πρέπει να είναι συνδεδεμένο σε πρίζα, έως ότου ολοκληρωθεί η κρυπτογράφηση. Αν διακόψετε τη διαδικασία κρυπτογράφησης, θα χάσετε ορισμένα ή όλα τα δεδομένα σας."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Κρυπτογράφηση tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Κρυπτογράφηση τηλεφώνου"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Φορτίστε την μπαταρία σας και δοκιμάστε ξανά."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Προσπαθήστε ξανά σε <xliff:g id="DELAY">^1</xliff:g> δευτερόλεπτα."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Πληκτρολογήστε τον κωδικό πρόσβασής σας"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Η κρυπτογράφηση απέτυχε"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Η κρυπτογράφηση διακόπηκε και δεν είναι δυνατή η ολοκλήρωσή της. Κατά συνέπεια, δεν είναι πλέον δυνατή η πρόσβαση στα δεδομένα στο tablet σας. "\n\n" Για να συνεχίσετε να χρησιμοποιείτε το tablet σας θα πρέπει να πραγματοποιήσετε επαναφορά των εργοστασιακών ρυθμίσεων. Όταν ρυθμίσετε το tablet σας μετά από την επαναφορά, θα μπορείτε να επαναφέρετε τα αντίγραφα ασφαλείας των δεδομένων σας από το Λογαριασμό σας Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Η κρυπτογράφηση διακόπηκε και δεν είναι δυνατή η ολοκλήρωσή της. Κατά συνέπεια, δεν είναι πλέον δυνατή η πρόσβαση στα δεδομένα στο τηλέφωνό σας. "\n\n"Για να συνεχίσετε να χρησιμοποιείτε το τηλέφωνό σας θα πρέπει να πραγματοποιήσετε επαναφορά των εργοστασιακών ρυθμίσεων. Όταν ρυθμίσετε το τηλέφωνό σας μετά από την επαναφορά, θα μπορείτε να επαναφέρετε τα αντίγραφα ασφαλείας των δεδομένων σας από τον Λογαριασμό σας Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Η κρυπτογράφηση διακόπηκε και δεν είναι δυνατή η ολοκλήρωσή της. Κατά συνέπεια, δεν είναι πλέον δυνατή η πρόσβαση στα δεδομένα στο tablet σας. \n\n Για να συνεχίσετε να χρησιμοποιείτε το tablet σας θα πρέπει να πραγματοποιήσετε επαναφορά των εργοστασιακών ρυθμίσεων. Όταν ρυθμίσετε το tablet σας μετά από την επαναφορά, θα μπορείτε να επαναφέρετε τα αντίγραφα ασφαλείας των δεδομένων σας από το Λογαριασμό σας Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Η κρυπτογράφηση διακόπηκε και δεν είναι δυνατή η ολοκλήρωσή της. Κατά συνέπεια, δεν είναι πλέον δυνατή η πρόσβαση στα δεδομένα στο τηλέφωνό σας. \n\nΓια να συνεχίσετε να χρησιμοποιείτε το τηλέφωνό σας θα πρέπει να πραγματοποιήσετε επαναφορά των εργοστασιακών ρυθμίσεων. Όταν ρυθμίσετε το τηλέφωνό σας μετά από την επαναφορά, θα μπορείτε να επαναφέρετε τα αντίγραφα ασφαλείας των δεδομένων σας από τον Λογαριασμό σας Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Εναλλαγή μεθόδου εισαγωγής"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Επιλογή κλειδ. οθόνης"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Επιλ. εφεδρ. κλειδώμ."</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Γίνεται σύνδεση"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Έχει συνδεθεί"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Διαθέσιμη"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Σε χρήση"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Ρυθμίσεις προβολής"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Αποσύνδεση;"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Με αυτόν τον τρόπο θα τερματιστεί η σύνδεσή σας με τη συσκευή:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,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">"Όταν αυτή η λειτουργία ειναι ενεργοποιημένη, μπορείτε να μεταδώσετε περιεχόμενο εφαρμογών σε άλλη συσκευή με δυνατότητα ΕΚΠ, διατηρώντας τις συσκευές σε κοντινή απόσταση μεταξύ τους. Για παράδειγμα, μπορείτε να μεταδώσετε σελίδες του προγράμματος περιήγησης, βίντεο του YouTube, επαφές και άλλα.\n\nΑπλώς φέρετε τις συσκευές σε κοντινή απόσταση μεταξύ τους (συνήθως πλάτη με πλάτη) και, στη συνέχεια, αγγίξτε την οθόνη. Η εφαρμογή καθορίζει τι θα μεταδοθεί."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Εντοπισμός υπηρεσίας δικτύου"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Να επιτρέπεται σε εφαρμογές ή σε άλλες συσκευές να εντοπίζουν εφαρμογές σε αυτήν τη συσκευή"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Ασφαλισμένα με <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", ασφαλισμένο με <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Καμία"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Για τη βελτίωση της ακρίβειας της τοποθεσίας σας και για άλλους σκοπούς, η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> επιθυμεί να ενεργοποιήσει τη σάρωση δικτύων, ακόμη και όταν το Wi-Fi είναι απενεργοποιημένο."\n\n"Να επιτρέπεται αυτή η ενέργεια για όλες τις εφαρμογές που επιθυμούν σάρωση;"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Για τη βελτίωση της ακρίβειας της τοποθεσίας σας και για άλλους σκοπούς, η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> επιθυμεί να ενεργοποιήσει τη σάρωση δικτύων, ακόμη και όταν το Wi-Fi είναι απενεργοποιημένο.\n\nΝα επιτρέπεται αυτή η ενέργεια για όλες τις εφαρμογές που επιθυμούν σάρωση;"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Να επιτραπεί"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Απόρριψη"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Σύνδεση"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: ενδέχεται να ισχύουν επιπλέον χρεώσεις από την εταιρεία κινητής τηλεφωνίας.\n\nΗ ρύθμιση του tablet μπορεί να προκαλέσει μεγάλη δραστηριότητα δικτύου."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: ενδέχεται να ισχύουν επιπλέον χρεώσεις από την εταιρεία κινητής τηλεφωνίας.\n\nΗ ρύθμιση του τηλεφώνου μπορεί να προκαλέσει μεγάλη δραστηριότητα δικτύου."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Μέχρι να αποκτήσετε σύνδεση στο διαδίκτυο, το tablet δεν θα μπορεί να ελέγξει αν το λογισμικό είναι ενημερωμένο."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Μέχρι να αποκτήσετε σύνδεση στο διαδίκτυο, το τηλέφωνο δεν θα μπορεί να ελέγξει αν το λογισμικό είναι ενημερωμένο."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Δεν ήταν δυνατή η σύνδεση του tablet σε αυτό το δίκτυο Wi-Fi."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"Αριθμός PIN κάρτας SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Εσφαλμένο PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Οι αριθμοί PIN δεν ταιριάζουν"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Δεν είναι δυνατή η αλλαγή PIN."\n"Πιθανόν ο αριθμός PIN να είναι εσφαλμένος."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Δεν είναι δυνατή η αλλαγή PIN.\nΠιθανόν ο αριθμός PIN να είναι εσφαλμένος."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Ο αριθμός PIN της κάρτας SIM άλλαξε επιτυχώς"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Δεν είναι δυνατή η αλλαγή της κατάστασης κλειδώματος της κάρτας SIM."\n"Πιθανόν ο αριθμός PIN να είναι εσφαλμένος."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Δεν είναι δυνατή η αλλαγή της κατάστασης κλειδώματος της κάρτας SIM.\nΠιθανόν ο αριθμός PIN να είναι εσφαλμένος."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Ακύρωση"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Κατάσταση tablet"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Επαναφορά εργοστασιακών δεδομένων"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Διαγραφή όλων των δεδομένων στο tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Διαγραφή όλων των δεδομένων στο τηλέφωνο"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" της συσκευής σας tablet, συμπεριλαμβανομένων:"\n\n"Των δεδομένων και των ρυθμίσεων συστήματος "<li>"του Λογαριασμού σας Google "</li>\n<li></li>\n<li>"Ληφθείσες εφαρμογές"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" της συσκευής σας tablet, συμπεριλαμβανομένων:"\n\n"Των δεδομένων και των ρυθμίσεων συστήματος "<li>"του Λογαριασμού σας Google "</li>\n<li></li>\n<li>"Ληφθείσες εφαρμογές"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Αυτήν τη στιγμή είστε συνδεδεμένοι στους παρακάτω λογαριασμούς:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" της συσκευής σας tablet, συμπεριλαμβανομένων:\n\nΤων δεδομένων και των ρυθμίσεων συστήματος "<li>"του Λογαριασμού σας Google "</li>\n<li></li>\n<li>"Ληφθείσες εφαρμογές"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον "<b>"εσωτερικό χώρο αποθήκευσης"</b>" της συσκευής σας tablet, συμπεριλαμβανομένων:\n\nΤων δεδομένων και των ρυθμίσεων συστήματος "<li>"του Λογαριασμού σας Google "</li>\n<li></li>\n<li>"Ληφθείσες εφαρμογές"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Αυτήν τη στιγμή είστε συνδεδεμένοι στους παρακάτω λογαριασμούς:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Μουσική"</li>\n<li>"Φωτογραφίες"</li>\n<li>"Άλλα δεδομένα χρήστη"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Πρέπει να γίνει διαγραφή του "<b>"χώρου αποθήκευσης USB"</b>" για να γίνει, επίσης, εκκαθάριση της μουσικής, των εικόνων και άλλων δεδομένων."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Πρέπει να γίνει εκκαθάριση της "<b>"κάρτας SD"</b>" για να γίνει, επίσης, εκκαθάριση της μουσικής, των εικόνων και άλλων δεδομένων."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Εμφ. διαδ. προσωρ. μνήμης"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Επαναφ. προτιμ. εφαρμ."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Επαναφ. προτιμ. εφαρμ;"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Η ενέργεια αυτή θα επαναφέρει όλες τις προτιμήσεις για:"\n\n" "<li>"Απενεργοποιημένες εφαρμογές"</li>\n" "<li>"Απενεργοποιημένες ειδοποιήσεις εφαρμογών"</li>\n" "<li>"Προεπιλεγμένες εφαρμογές για ενέργειες"</li>\n" "<li>"Περιορισμοί δεδομένων παρασκηνίου για εφαρμογές"</li>\n\n" Δεν θα χάσετε τα δεδομένα εφαρμογών."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Η ενέργεια αυτή θα επαναφέρει όλες τις προτιμήσεις για:\n\n "<li>"Απενεργοποιημένες εφαρμογές"</li>\n" "<li>"Απενεργοποιημένες ειδοποιήσεις εφαρμογών"</li>\n" "<li>"Προεπιλεγμένες εφαρμογές για ενέργειες"</li>\n" "<li>"Περιορισμοί δεδομένων παρασκηνίου για εφαρμογές"</li>\n\n" Δεν θα χάσετε τα δεδομένα εφαρμογών."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Επαναφορά εφαρμογών"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Διαχείριση χώρου"</string>
     <string name="filter" msgid="2018011724373033887">"Φίλτρο"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Για εναλ., πατ. Control-Πληκ.διαστ."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Προεπιλογή"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Διατάξεις πληκτρολογίου"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Λεξικό χρήστη"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Προσωπικό λεξικό"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Προσωπικά λεξικά"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Προσωπικό λεξικό"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Προσθήκη"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Προσθήκη στο λεξικό"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Συμπερίληψη επιλογής στο μενού λειτουργίας για λήψη αναφοράς σφαλμάτων"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Παραμονή σε κανονική κατάσταση λειτουργίας"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Η οθόνη δεν θα μεταβαίνει ποτέ σε κατάσταση αδράνειας κατά τη φόρτιση"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ενεργοποίηση αρχείου καταγραφής παρακολούθησης Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Καταγραφή όλων των πακέτων bluetooth HCI σε ένα αρχείο"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Επιλογή χρόνου εκτέλεσης"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Επιλογή χρόνου εκτέλεσης"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Να γίνει επανεκκίνηση για την αλλαγή του χρόνου εκτέλεσης από <xliff:g id="OLD">%1$s</xliff:g> σε <xliff:g id="NEW">%2$s</xliff:g>;"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Να επιτρέπεται ο εντοπισμός σφαλμάτων USB;"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Προστασία χώρου αποθήκευσης USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Οι εφαρμογές πρέπει να ζητούν άδεια για την ανάγνωση χώρου αποθήκευσης USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Να προστατεύεται ο χώρος αποθήκευσης USB;"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Όταν ένας χώρος αποθήκευσης USB προστατεύεται, οι εφαρμογές πρέπει να ζητούν άδεια για την ανάγνωση δεδομένων από τον εξωτερικό χώρο αποθήκευσης."\n\n"Ορισμένες εφαρμογές ενδέχεται να μην λειτουργούν μέχρι να ενημερωθούν από τους προγραμματιστές τους."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Όταν ένας χώρος αποθήκευσης USB προστατεύεται, οι εφαρμογές πρέπει να ζητούν άδεια για την ανάγνωση δεδομένων από τον εξωτερικό χώρο αποθήκευσης.\n\nΟρισμένες εφαρμογές ενδέχεται να μην λειτουργούν μέχρι να ενημερωθούν από τους προγραμματιστές τους."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Προστασία κάρτας SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Οι εφαρμογές πρέπει να ζητούν άδεια για την ανάγνωση κάρτας SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Να προστατεύεται η κάρτα SD;"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Όταν μια κάρτα SD προστατεύεται, οι εφαρμογές πρέπει να ζητούν άδεια για την ανάγνωση δεδομένων από τον εξωτερικό χώρο αποθήκευσης."\n\n"Ορισμένες εφαρμογές ενδέχεται να μην λειτουργούν μέχρι να ενημερωθούν από τους προγραμματιστές τους."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Όταν μια κάρτα SD προστατεύεται, οι εφαρμογές πρέπει να ζητούν άδεια για την ανάγνωση δεδομένων από τον εξωτερικό χώρο αποθήκευσης.\n\nΟρισμένες εφαρμογές ενδέχεται να μην λειτουργούν μέχρι να ενημερωθούν από τους προγραμματιστές τους."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Τοπική τερματική εφαρμογή"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Ενεργοπ.τερμ.εφαρμογής που προσφέρει πρόσβαση στο τοπικό κέλυφος"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Επιλογή gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Επιλογή γραφικού στοιχείου"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Να γίνει δημιουργία γραφικού στοιχείου και να επιτρέπεται η πρόσβαση;"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Υπηρεσίες"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Σύστημα"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Κινήσεις μεγέθυνσης"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Όταν είναι ενεργοποιημένη αυτή η λειτουργία, μπορείτε να κάνετε μεγέθυνση και σμίκρυνση πατώντας τρεις φορές την οθόνη."\n\n"Κατά τη μεγέθυνση, μπορείτε να κάνετε:"\n<ul><li>"Πανοραμική λήψη: σύρετε δύο ή περισσότερα δάχτυλα κατά μήκος της οθόνης."</li>\n<li>"Προσαρμογή του επιπέδου μεγέθυνσης: πλησιάστε δύο ή περισσότερα δάχτυλα ή απομακρύνετέ τα."</li></ul>\n\n"Μπορείτε επίσης να μεγεθύνετε προσωρινά το περιεχόμενο που βρίσκεται κάτω από το δάχτυλό σας πατώντας τρεις φορές και κρατώντας παρατεταμένα. Κατά τη μεγέθυνση, μπορείτε να σύρετε το δάχτυλό σας για να εξερευνήσετε διάφορα τμήματα της οθόνης. Σηκώστε το δάχτυλό σας για να επιστρέψετε στην προηγούμενη κατάσταση."\n\n"Σημείωση: το πάτημα τρεις φορές για μεγέθυνση λειτουργεί παντού εκτός από το πληκτρολόγιο και τη γραμμή πλοήγησης."</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_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>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Το TalkBack παρέχει σχόλια σε μορφή ομιλίας για να διευκολύνει χρήστες με προβλήματα όρασης. Θέλετε να το εγκαταστήσετε δωρεάν από το Android Market;"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Δεν υπάρχει περιγραφή."</string>
     <string name="settings_button" msgid="3006713718908152930">"Ρυθμίσεις"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Εκτύπωση"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Ρυθμίσεις εκτύπωσης"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Υπηρεσίες"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Χρήση υπηρεσίας <xliff:g id="SERVICE">%1$s</xliff:g>;"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"Η υπηρεσία <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> μπορεί να λάβει τα έγγραφα που εκτυπώνετε. Τα έγγραφα αυτού του είδους ενδέχεται να περιέχουν ευαίσθητα δεδομένα."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Δεν έχουν εγκατασταθεί υπηρεσίες"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Ρυθμίσεις"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Προσθήκη εκτυπωτών"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Ενεργό"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Ανενεργό"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Μπαταρία"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Τι χρησιμοποιούσε την μπαταρία"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Μη διαθέσιμα δεδ. χρήσ. μπατ."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Το Wi-Fi είναι ενεργό"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Τηλέφωνο"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Τα δεδομένα εστάλησαν"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Τα δεδομένα ελήφθησαν"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Αποστολή δεδομ. κιν. τηλεφωνίας"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Λήψη δεδομ. κινητής τηλεφωνίας"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Αποστολή δεδομένων Wi‑Fi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Λήψη δεδομένων Wi‑Fi"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Ήχος"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Βίντεο"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Η ώρα είναι ενεργοποιημένη"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Τόνος"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Επηρεάζει τον τόνο του προφορικού κειμένου"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Γλώσσα"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Δεν έχει επιλεγεί γλώσσα"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Ορίζει τη φωνή που σχετίζεται με τη γλώσσα για το κείμενο ομιλίας"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Ακούστε ένα παράδειγμα"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Αναπαραγωγή μιας σύντομης αναπαράστασης σύνθεσης λόγου"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"Το EAP δεν υποστηρίζεται."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Δεν είναι δυνατή η διαμόρφωση σύνδεσης EAP Wi-Fi κατά τη διάρκεια της εγκατάστασης. Μετά την εγκατάσταση, μπορείτε να τη διαμορφώσετε από το στοιχείο Ρυθμίσεις &gt; Ασύρματο και δίκτυα."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Η σύνδεση μπορεί να διαρκέσει αρκετά λεπτά..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Αγγίξτε το στοιχείο "<b>"Επόμενο"</b>" για να συνεχίσετε την εγκατάσταση."\n\n"Αγγίξτε το στοιχείο "<b>"Πίσω"</b>"για να συνδεθείτε σε διαφορετικό δίκτυο Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Αγγίξτε το στοιχείο "<b>"Επόμενο"</b>" για να συνεχίσετε την εγκατάσταση.\n\nΑγγίξτε το στοιχείο "<b>"Πίσω"</b>"για να συνδεθείτε σε διαφορετικό δίκτυο Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Ενεργοποιημένος συγχρονισμός"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Συγχρονισμός είναι απενεργοποιημένος"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Σφάλμα συγχρονισμού."</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Ημερολόγιο"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Επαφές"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Καλώς ορίσατε στο Google Sync!"</font>" "\n"Πρόκειται για μια προσέγγιση της Google στον συγχρονισμό δεδομένων, η οποία επιτρέπει την πρόσβαση στις επαφές, στις συναντήσεις σας και σε πολλά άλλα, όπου και αν βρίσκεστε."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Καλώς ορίσατε στο Google Sync!"</font>" \nΠρόκειται για μια προσέγγιση της Google στον συγχρονισμό δεδομένων, η οποία επιτρέπει την πρόσβαση στις επαφές, στις συναντήσεις σας και σε πολλά άλλα, όπου και αν βρίσκεστε."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Ρυθμίσεις συγχρονισμού εφαρμογής"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Δεδομένα και συγχρονισμός"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Αλλαγή κωδικού πρόσβασης"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Κατάρ.σφαλμ.υπέρβ.GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Απενεργ. επικαλύψεων HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Να γίνεται πάντα χρήση του GPU για σύνθεση οθόνης"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ενεργοποίηση ιχνών OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Απενεργ. δεδ. παρασκ. σε δίκτυα κινητής. Θα χρησιμ. άλλα δίκτυα."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Ορίστε ένα όριο δεδ. κιν. τηλ. για να περιορ. τα δεδ. παρασκ."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Περιορ.δεδομ.παρασκην.;"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Αυτή η λειτουργία μπορεί να κάνει μια εφαρμογή που βασίζεται στα δεδομένα παρασκηνίου να πάψει να λειτουργεί σωστά όταν διατίθενται μόνο δίκτυα κινητής τηλεφωνίας ."\n\n"Μπορείτε να βρείτε περισσότερα κατάλληλα στοιχεία ελέγχου χρήσης δεδομένων στις ρυθμίσεις που διατίθενται στην εφαρμογή."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Αυτή η λειτουργία μπορεί να κάνει μια εφαρμογή που βασίζεται στα δεδομένα παρασκηνίου να πάψει να λειτουργεί σωστά όταν διατίθενται μόνο δίκτυα κινητής τηλεφωνίας .\n\nΜπορείτε να βρείτε περισσότερα κατάλληλα στοιχεία ελέγχου χρήσης δεδομένων στις ρυθμίσεις που διατίθενται στην εφαρμογή."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Ο περιορισμός των δεδομένων παρασκηνίου είναι δυνατός μόνο όταν έχετε ορίσει ένα όριο δεδομένων κινητής τηλεφωνίας."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Ενεργοπ. αυτόμ. συγχρ. δεδομ.;"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Θα γίνεται αυτόματη αντιγραφή τυχόν αλλαγών που πραγματοποιείτε στους λογαριασμούς σας στον ιστό στο tablet σας."\n\n"Σε ορισμένους λογαριασμούς ενδέχεται να γίνεται αυτόματη αντιγραφή τυχόν αλλαγών που πραγματοποιείτε στο tablet σας στον ιστό. Ένας Λογαριασμός Google λειτουργεί με αυτόν τον τρόπο."\n\n"Για να επιλέξετε το είδος των πληροφοριών που συγχρονίζονται σε κάθε λογαριασμό, μεταβείτε στην περιοχή Ρυθμίσεις &gt; Λογαριασμοί."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Θα γίνεται αυτόματη αντιγραφή τυχόν αλλαγών που πραγματοποιείτε στους λογαριασμούς σας στον ιστό στο τηλέφωνό σας."\n\n"Σε ορισμένους λογαριασμούς ενδέχεται να γίνεται αυτόματη αντιγραφή τυχόν αλλαγών που πραγματοποιείτε στο τηλέφωνό σας στον ιστό. Ένας Λογαριασμός Google λειτουργεί με αυτόν τον τρόπο."\n\n"Για να επιλέξετε το είδος των πληροφοριών που συγχρονίζονται σε κάθε λογαριασμό, μεταβείτε στην περιοχή Ρυθμίσεις &gt; Λογαριασμοί."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Θα γίνεται αυτόματη αντιγραφή τυχόν αλλαγών που πραγματοποιείτε στους λογαριασμούς σας στον ιστό στο tablet σας.\n\nΣε ορισμένους λογαριασμούς ενδέχεται να γίνεται αυτόματη αντιγραφή τυχόν αλλαγών που πραγματοποιείτε στο tablet σας στον ιστό. Ένας Λογαριασμός Google λειτουργεί με αυτόν τον τρόπο.\n\nΓια να επιλέξετε το είδος των πληροφοριών που συγχρονίζονται σε κάθε λογαριασμό, μεταβείτε στην περιοχή Ρυθμίσεις &gt; Λογαριασμοί."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Θα γίνεται αυτόματη αντιγραφή τυχόν αλλαγών που πραγματοποιείτε στους λογαριασμούς σας στον ιστό στο τηλέφωνό σας.\n\nΣε ορισμένους λογαριασμούς ενδέχεται να γίνεται αυτόματη αντιγραφή τυχόν αλλαγών που πραγματοποιείτε στο τηλέφωνό σας στον ιστό. Ένας Λογαριασμός Google λειτουργεί με αυτόν τον τρόπο.\n\nΓια να επιλέξετε το είδος των πληροφοριών που συγχρονίζονται σε κάθε λογαριασμό, μεταβείτε στην περιοχή Ρυθμίσεις &gt; Λογαριασμοί."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Απενεργ. αυτόμ. συγχρ. δεδομ.;"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Με αυτόν τον τρόπο θα εξοικονομήσετε δεδομένα και χρήση μπαταρίας, αλλά θα πρέπει να συγχρονίσετε κάθε λογαριασμό με μη αυτόματο τρόπο για να συλλέξετε πρόσφατες πληροφορίες. Δεν θα λαμβάνετε ειδοποιήσεις κατά τη διάρκεια των ενημερώσεων."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Ημερομηνία επαναφοράς κύκλου χρήσης"</string>
@@ -1751,13 +1769,13 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Ορισμός προειδοποίησης χρήσης δεδομένων"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Ορισμός ορίου χρήσης δεδομένων"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Περιορισμός χρήσης δεδομένων"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Η σύνδεση των δεδομένων του κινητού τηλεφώνου σας θα απενεργοποιηθεί μόλις συμπληρωθεί το καθορισμένο όριο."\n\n"Επειδή η χρήση δεδομένων υπολογίζεται από το tablet σας και ενδέχεται η εταιρεία κινητής τηλεφωνίας να την υπολογίζει με διαφορετικό τρόπο, καλό θα ήταν να χρησιμοποιήσετε ένα συντηρητικό όριο."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Η σύνδεση των δεδομένων του κινητού τηλεφώνου σας θα απενεργοποιηθεί μόλις συμπληρωθεί το καθορισμένο όριο."\n\n"Επειδή η χρήση δεδομένων υπολογίζεται από το τηλέφωνό σας και ενδέχεται η εταιρεία κινητής τηλεφωνίας να την υπολογίζει με διαφορετικό τρόπο, σκεφτείτε το ενδεχόμενο να χρησιμοποιήσετε ένα συντηρητικό όριο."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Η σύνδεση των δεδομένων του κινητού τηλεφώνου σας θα απενεργοποιηθεί μόλις συμπληρωθεί το καθορισμένο όριο.\n\nΕπειδή η χρήση δεδομένων υπολογίζεται από το tablet σας και ενδέχεται η εταιρεία κινητής τηλεφωνίας να την υπολογίζει με διαφορετικό τρόπο, καλό θα ήταν να χρησιμοποιήσετε ένα συντηρητικό όριο."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Η σύνδεση των δεδομένων του κινητού τηλεφώνου σας θα απενεργοποιηθεί μόλις συμπληρωθεί το καθορισμένο όριο.\n\nΕπειδή η χρήση δεδομένων υπολογίζεται από το τηλέφωνό σας και ενδέχεται η εταιρεία κινητής τηλεφωνίας να την υπολογίζει με διαφορετικό τρόπο, σκεφτείτε το ενδεχόμενο να χρησιμοποιήσετε ένα συντηρητικό όριο."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Περιορ.δεδομ.παρασκην.;"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Αν περιορίσετε τα δεδομένα παρασκηνίου κινητής τηλεφωνίας, ορισμένες εφαρμογές και υπηρεσίες δεν θα λειτουργούν εκτός και αν έχετε συνδεθεί σε δίκτυο Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Αν περιορίσετε τη χρήση των δεδομένων κινητής τηλεφωνίας στο παρασκήνιο, ορισμένες εφαρμογές και υπηρεσίες δεν θα λειτουργούν, εκτός εάν είστε συνδεδεμένοι σε δίκτυο Wi-Fi."\n\n"Αυτή η ρύθμιση επηρεάζει όλους τους χρήστες στο συγκεκριμένο tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Αν περιορίσετε τη χρήση των δεδομένων κινητής τηλεφωνίας στο παρασκήνιο, ορισμένες εφαρμογές και υπηρεσίες δεν θα λειτουργούν, εκτός εάν είστε συνδεδεμένοι σε δίκτυο Wi-Fi."\n\n"Αυτή η ρύθμιση επηρεάζει όλους τους χρήστες που χρησιμοποιούν το συγκεκριμένο τηλέφωνο."</string>
-    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">" <xliff:g id="NUMBER">^1</xliff:g> "</font>" "<font size="9">" <xliff:g id="UNIT">^2</xliff:g> "</font>" "\n" "<font size="12">" προειδοποίηση "</font></string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Αν περιορίσετε τη χρήση των δεδομένων κινητής τηλεφωνίας στο παρασκήνιο, ορισμένες εφαρμογές και υπηρεσίες δεν θα λειτουργούν, εκτός εάν είστε συνδεδεμένοι σε δίκτυο Wi-Fi.\n\nΑυτή η ρύθμιση επηρεάζει όλους τους χρήστες στο συγκεκριμένο tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Αν περιορίσετε τη χρήση των δεδομένων κινητής τηλεφωνίας στο παρασκήνιο, ορισμένες εφαρμογές και υπηρεσίες δεν θα λειτουργούν, εκτός εάν είστε συνδεδεμένοι σε δίκτυο Wi-Fi.\n\nΑυτή η ρύθμιση επηρεάζει όλους τους χρήστες που χρησιμοποιούν το συγκεκριμένο τηλέφωνο."</string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">" <xliff:g id="NUMBER">^1</xliff:g> "</font>" "<font size="9">" <xliff:g id="UNIT">^2</xliff:g> "</font>" \n "<font size="12">" προειδοποίηση "</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"όριο"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Εφαρμογές που καταργήθηκαν"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Εφαρμογές και χρήστες που έχουν καταργηθεί"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Χρήστης"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Προφίλ περιορ. πρόσβασης"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Προσθήκη νέου χρήστη"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Μπορείτε να μοιραστείτε αυτή τη συσκευή με άλλους χρήστες δημιουργώντας επιπλέον χρήστες. Κάθε χρήστης διαθέτει τον δικό του χώρο, τον οποίο μπορεί να προσαρμόσει με τις δικές του εφαρμογές, την ταπετσαρία και ούτω καθεξής. Οι χρήστες μπορούν επίσης να προσαρμόσουν τις ρυθμίσεις tablet όπως το Wi-Fi που επηρεάζουν τους πάντες."\n\n"Αφού δημιουργήσετε έναν νέο χρήστη, αυτό το άτομο θα πρέπει να ολοκληρώσει τη διαδικασία ρύθμισης."\n\n"Οποιοδήποτε χρήστης μπορεί να αποδεχτεί ενημερωμένα δικαιώματα εφαρμογών εκ μέρους άλλων χρηστών."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"Αφού δημιουργήσετε έναν νέο χρήστη, αυτό το άτομο θα πρέπει να ολοκληρώσει τη διαδικασία ρύθμισης."\n\n"Οποιοδήποτε χρήστης μπορεί να αποδεχτεί ενημερωμένα δικαιώματα εφαρμογών εκ μέρους των άλλων χρηστών."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Μπορείτε να μοιραστείτε αυτή τη συσκευή με άλλους χρήστες δημιουργώντας επιπλέον χρήστες. Κάθε χρήστης διαθέτει τον δικό του χώρο, τον οποίο μπορεί να προσαρμόσει με τις δικές του εφαρμογές, την ταπετσαρία και ούτω καθεξής. Οι χρήστες μπορούν επίσης να προσαρμόσουν τις ρυθμίσεις tablet όπως το Wi-Fi που επηρεάζουν τους πάντες.\n\nΑφού δημιουργήσετε έναν νέο χρήστη, αυτό το άτομο θα πρέπει να ολοκληρώσει τη διαδικασία ρύθμισης.\n\nΟποιοδήποτε χρήστης μπορεί να αποδεχτεί ενημερωμένα δικαιώματα εφαρμογών εκ μέρους άλλων χρηστών."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Αφού δημιουργήσετε έναν νέο χρήστη, αυτό το άτομο θα πρέπει να ολοκληρώσει τη διαδικασία ρύθμισης.\n\nΟποιοδήποτε χρήστης μπορεί να αποδεχτεί ενημερωμένα δικαιώματα εφαρμογών εκ μέρους των άλλων χρηστών."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Να γίνει ρύθμιση χρήστη τώρα;"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Βεβαιωθείτε ότι ο χρήστης έχει τη δυνατότητα να ρυθμίσει το χώρο του στο tablet"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Να γίνει ρύθμιση προφίλ τώρα;"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Αυτή η χρήση επηρεάζει όλους τους χρήστες στο συγκεκριμένο τηλέφωνο."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Αλλαγή γλώσσας"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Αλλαγή μεγέθους γραμματοσειράς"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Περιορισμοί"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Κατάργηση περιορισμών"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Αλλαγή κωδικού PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Εμφάν. ειδοποιήσεων"</string>
     <string name="help_label" msgid="1107174367904110532">"Βοήθεια"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Λογαριασμός για περιεχόμενο"</string>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 6576fa7139a..cff546a4f24 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Location"</item>
     <item msgid="255608127647030286">"Personal"</item>
     <item msgid="4588829735729884491">"Messaging"</item>
-    <item msgid="8971765125227378270">"Device"</item>
+    <item msgid="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Device"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"coarse location"</item>
@@ -246,7 +247,7 @@
     <item msgid="6546959730920410907">"modify call log"</item>
     <item msgid="446877710771379667">"read calendar"</item>
     <item msgid="7674458294386319722">"modify calendar"</item>
-    <item msgid="8281201165558093009">"wi-fi scan"</item>
+    <item msgid="8281201165558093009">"Wi-Fi scan"</item>
     <item msgid="8694611243479480497">"notification"</item>
     <item msgid="7776439107987345446">"cell scan"</item>
     <item msgid="514615766544675057">"call phone"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"play audio"</item>
     <item msgid="8374996688066472414">"read clipboard"</item>
     <item msgid="3045529469061083747">"modify clipboard"</item>
+    <item msgid="5124443975763747838">"media buttons"</item>
+    <item msgid="4547883971364273343">"audio focus"</item>
+    <item msgid="2603878814882344450">"master volume"</item>
+    <item msgid="7136963238377062018">"voice volume"</item>
+    <item msgid="4270236897655923007">"ring volume"</item>
+    <item msgid="6325739889222559394">"media volume"</item>
+    <item msgid="5762123934816216821">"alarm volume"</item>
+    <item msgid="785049718065337473">"notification volume"</item>
+    <item msgid="6700305533746877052">"Bluetooth volume"</item>
+    <item msgid="2029227495214047094">"keep awake"</item>
+    <item msgid="26109888160231211">"monitor location"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Location"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Play audio"</item>
     <item msgid="136815868796597058">"Read clipboard"</item>
     <item msgid="5238692940326972503">"Modify clipboard"</item>
+    <item msgid="5753789168376302997">"Media buttons"</item>
+    <item msgid="3265262911688671938">"Audio focus"</item>
+    <item msgid="2098976479485046797">"Master volume"</item>
+    <item msgid="5660213838861789350">"Voice volume"</item>
+    <item msgid="7983336752371254444">"Ring volume"</item>
+    <item msgid="7878027809189330917">"Media volume"</item>
+    <item msgid="7260546305036218513">"Alarm volume"</item>
+    <item msgid="9103719301075748925">"Notification volume"</item>
+    <item msgid="7025966722295861512">"Bluetooth volume"</item>
+    <item msgid="4665183401128289653">"Keep awake"</item>
+    <item msgid="8584357129746649222">"Location"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Short"</item>
     <item msgid="2560532955514699713">"Medium"</item>
     <item msgid="2372711992605524591">"Long"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (debug)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Use Dalvik"</item>
+    <item msgid="5131846588686178907">"Use ART"</item>
+    <item msgid="4530003713865319928">"Use ART debug build"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Never check"</item>
     <item msgid="6042769699089883931">"Check for DRM content only"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"On screen as lines"</item>
     <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Off"</item>
+    <item msgid="7688197031296835369">"Show overdraw areas"</item>
+    <item msgid="8332661909019981149">"Show overdraw counter"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standard limit"</item>
     <item msgid="4071574792028999443">"No background processes"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index ff599859d17..b9da9f91af9 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"When you allow data roaming, you may incur significant roaming charges!\n\nThis setting affects all users on this tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"When you allow data roaming, you may incur significant roaming charges!\n\nThis setting affects all users on this phone."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Allow data roaming?"</string>
     <string name="networks" msgid="6333316876545927039">"Operator selection"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Choose a network operator"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Require a numerical PIN or password to decrypt your tablet each time that you turn it on"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Require a numerical PIN or password to decrypt your phone each time that you turn it on"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encrypted"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. Once you encrypt your tablet, you need to type a numeric PIN or password to decrypt it each time you switch it on. You can only decrypt your tablet by performing a factory data reset, erasing all your data."\n\n"Encryption takes an hour or more. You must start with a charged battery and keep your tablet plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. Once you encrypt your phone, you need to type a numeric PIN or password to decrypt it each time you switch it on. You can\'t decrypt your phone except by performing a factory data reset, erasing all your data."\n\n"Encryption takes an hour or more. You must start with a charged battery and keep your phone plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. Once you encrypt your tablet, you need to type a numeric PIN or password to decrypt it each time you switch it on. You can only decrypt your tablet by performing a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your tablet plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. Once you encrypt your phone, you need to type a numeric PIN or password to decrypt it each time you switch it on. You can\'t decrypt your phone except by performing a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your phone plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encrypt tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encrypt phone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Please charge your battery and try again."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Try again in <xliff:g id="DELAY">^1</xliff:g> seconds."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Type your password"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encryption unsuccessful"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Encryption was interrupted and can\'t be completed. As a result, the data on your tablet is no longer accessible. "\n\n" To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Encryption was interrupted and can\'t be completed. As a result, the data on your phone is no longer accessible. "\n\n"To resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Encryption was interrupted and can\'t be completed. As a result, the data on your tablet is no longer accessible. \n\n To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Encryption was interrupted and can\'t be completed. As a result, the data on your phone is no longer accessible. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Switch input method"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Choose screen lock"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Choose backup lock"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Connecting"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Connected"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Available"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"In use"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Display settings"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Disconnect?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"This will end your connection with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Off"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Unavailable because NFC is turned off"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"When this feature is turned on, you can beam app content to another NFC-capable device by holding the devices close together. For example, you can beam Browser pages, YouTube videos, People contacts and more."\n\n"Just bring the devices together (typically back to back) and then touch your screen. The app determines what gets beamed."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"When this feature is turned on, you can beam app content to another NFC-capable device by holding the devices close together. For example, you can beam Browser pages, YouTube videos, People contacts and more.\n\nJust bring the devices together (typically back to back) and then touch your screen. The app determines what gets beamed."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Network service discovery"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Allow apps on other devices to discover apps on this device"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Secured with <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", secured with <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"None"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"To improve location accuracy and for other purposes, <xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off."\n\n"Allow this for all apps that want to scan?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"To improve location accuracy and for other purposes, <xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Allow"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Deny"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connect"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"WARNING: You may incur extra carrier data charges.\n\nTablet setup can require significant network activity."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"WARNING: You may incur extra carrier data charges.\n\nPhone setup can require significant network activity."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"WARNING: Until you have an internet connection, the tablet won\'t be able to verify that your software is up to date."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"WARNING: Until you have an internet connection, the phone won\'t be able to verify that your software is up to date."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"The tablet was unable to connect to this Wi‑Fi network."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Incorrect PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PINs don\'t match"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Can\'t change PIN."\n"Possibly incorrect PIN."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Can\'t change PIN.\nPossibly incorrect PIN."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN changed successfully"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Can\'t change SIM card lock state."\n"Possibly incorrect PIN."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Can\'t change SIM card lock state.\nPossibly incorrect PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancel"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tablet status"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Factory data reset"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Erases all data on tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Erases all data on phone"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"This will erase all data from your tablet\'s "<b>"internal storage"</b>", including:"\n\n<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:"\n\n<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"This will erase all data from your tablet\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Show cached processes"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Reset app preferences"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Reset app preferences?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"This will reset all preferences for:"\n\n" "<li>"Disabled apps"</li>\n" "<li>"Disabled app notifications"</li>\n" "<li>"Default applications for actions"</li>\n" "<li>"Background data restrictions for apps"</li>\n\n" You will not lose any app data."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"This will reset all preferences for:\n\n "<li>"Disabled apps"</li>\n" "<li>"Disabled app notifications"</li>\n" "<li>"Default applications for actions"</li>\n" "<li>"Background data restrictions for apps"</li>\n\n" You will not lose any app data."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Reset apps"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Manage space"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"To switch, press Control-Spacebar"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Default"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Keyboard layouts"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"User dictionary"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Personal dictionary"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Personal dictionaries"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Personal dictionary"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Add"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Add to dictionary"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Include option in power menu for taking a bug report"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Stay awake"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Screen will never sleep while charging"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Enable Bluetooth HCI snoop log"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capture all Bluetooth HCI packets in a file"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Select runtime"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Select runtime"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Reboot to change runtime from <xliff:g id="OLD">%1$s</xliff:g> to <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Allow USB debugging?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Protect USB storage"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apps must request permission to read USB storage"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Protect USB storage?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"When USB storage is protected, apps must request permission to read data from external storage."\n\n"Some apps may not work until updated by their developers."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"When USB storage is protected, apps must request permission to read data from external storage.\n\nSome apps may not work until updated by their developers."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Protect SD card"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apps must request permission to read SD card"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Protect SD card?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"When SD card is protected, apps must request permission to read data from external storage."\n\n"Some apps may not work until updated by their developers."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"When SD card is protected, apps must request permission to read data from external storage.\n\nSome apps may not work until updated by their developers."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Local terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Enable terminal app that offers local shell access"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Choose gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Choose widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Create widget and allow access?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Services"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</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_screen_magnification_summary" msgid="2380627654189671754">"When this feature is turned on, you can zoom in and out by triple-tapping the screen.\n\nWhile zoomed in, you can:\n"<ul><li>"Pan: Drag two or more fingers across the screen."</li>\n<li>"Adjust zoom level: Pinch two or more fingers together or spread them apart."</li></ul>\n\n"You can also temporarily magnify what\'s under your finger by triple-tapping and holding. In this magnified state, you can drag your finger to explore different parts of the screen. Lift your finger to return to your previous state.\n\nNote: Triple-tap for magnification works everywhere except the keyboard and navigation bar."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Accessibility shortcut"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"On"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Off"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"When this feature is turned on, you can quickly enable accessibility features in two steps:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"When this feature is turned on, you can quickly enable accessibility features in two steps:\n\nStep 1: Press and hold the power button until you hear a sound or feel a vibration.\n\nStep 2: Touch and hold two fingers until you hear audio confirmation.\n\nIf the device has multiple users, using this shortcut on the lock screen temporarily enables accessibility until the device is unlocked."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Large text"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Screen magnification"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto update screen magnification"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack provides spoken feedback to help blind and low-vision users. Do you want to install it for free from Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No description provided."</string>
     <string name="settings_button" msgid="3006713718908152930">"Settings"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Printing"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Printing settings"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Services"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> can receive documents you print. Such documents may contain sensitive data."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"No services installed"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Settings"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Add printers"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"On"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Off"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Battery"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"What has been using the battery"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Battery usage data isn\'t available."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi‑Fi running"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Phone"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Data sent"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Data received"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Mobile data sent"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Mobile data received"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Wi‑Fi data sent"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Wi‑Fi data received"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Time on"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pitch"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Affects the tone of the spoken text"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Language"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Language not selected"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Sets the language-specific voice for the spoken text"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Listen to an example"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Play a short demonstration of speech synthesis"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP isn\'t supported."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"You can\'t configure an EAP Wi‑Fi connection during setup. After setup, you can do that in Settings &gt; Wireless &amp; networks."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Connecting can take a few minutes..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Touch "<b>"Next"</b>" to continue with setup."\n\n"Touch "<b>"Back"</b>" to connect to a different Wi‑Fi network."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Touch "<b>"Next"</b>" to continue with setup.\n\nTouch "<b>"Back"</b>" to connect to a different Wi‑Fi network."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sync enabled"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sync disabled"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Sync error..."</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Calendar"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Contacts"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" "\n"A Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"App sync settings"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data &amp; synchronisation"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Change password"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Debug GPU overdraw"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Disable HW overlays"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Always use GPU for screen compositing"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Enable OpenGL traces"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Disable background data on mobile networks. Non-mobile networks will be used if available."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"To restrict background data for this app, first set a mobile data limit."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Restrict background data?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"This feature may cause an app that depends on background data to stop working when only mobile networks are available."\n\n"You can find more appropriate data usage controls in the settings available within the app."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"This feature may cause an app that depends on background data to stop working when only mobile networks are available.\n\nYou can find more appropriate data usage controls in the settings available within the app."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Restricting background data is possible only when you\'ve set a mobile data limit."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Turn auto-sync data on?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Any changes you make to your accounts on the web will be automatically copied to your tablet."\n\n"Some accounts may also automatically copy any changes you make on the tablet to the web. A Google Account works this way."\n\n"To choose which kinds of information to sync within each account, go to Settings &gt; Accounts."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Any changes you make to your accounts on the web will be automatically copied to your phone."\n\n"Some accounts may also automatically copy any changes you make on the phone to the web. A Google Account works this way."\n\n"To choose which kinds of information to sync within each account, go to Settings &gt; Accounts."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Any changes you make to your accounts on the web will be automatically copied to your tablet.\n\nSome accounts may also automatically copy any changes you make on the tablet to the web. A Google Account works this way.\n\nTo choose which kinds of information to sync within each account, go to Settings &gt; Accounts."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Any changes you make to your accounts on the web will be automatically copied to your phone.\n\nSome accounts may also automatically copy any changes you make on the phone to the web. A Google Account works this way.\n\nTo choose which kinds of information to sync within each account, go to Settings &gt; Accounts."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Turn auto-sync data off?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"This will conserve data and battery usage, but you\'ll need to sync each account manually to collect recent information. And you won\'t receive notifications when updates occur."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Usage cycle reset date"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Set data usage warning"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Set data usage limit"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limiting data usage"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Your mobile data connection will be disabled when the specified limit is reached."\n\n"Since data usage is measured by your tablet, and your carrier may account for usage differently, consider using a conservative limit."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Your mobile data connection will be disabled when the specified limit is reached."\n\n"Since data usage is measured by your phone, and your carrier may account for usage differently, consider using a conservative limit."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Your mobile data connection will be disabled when the specified limit is reached.\n\nSince data usage is measured by your tablet, and your carrier may account for usage differently, consider using a conservative limit."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Your mobile data connection will be disabled when the specified limit is reached.\n\nSince data usage is measured by your phone, and your carrier may account for usage differently, consider using a conservative limit."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Restrict background data?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi‑Fi network."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi‑Fi network."\n\n"This setting affects all users on this tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi‑Fi network."\n\n"This setting affects all users on this phone."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi‑Fi network.\n\nThis setting affects all users on this tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi‑Fi network.\n\nThis setting affects all users on this phone."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"warning"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limit"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Removed apps"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"User"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Restricted profile"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Add new user"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"You can share this device with other people by creating additional users. Each user has their own space, which they can customise with their own apps, wallpaper and so on. Users can also adjust tablet settings like Wi‑Fi that affect everyone."\n\n"After you create a new user, that person needs to go through a set-up process."\n\n"Any user can accept updated app permissions on behalf of all other users."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"After you create a new user, that person needs to go through a setup process."\n\n"Any user can accept updated app permissions on behalf of all other users."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"You can share this device with other people by creating additional users. Each user has their own space, which they can customise with their own apps, wallpaper and so on. Users can also adjust tablet settings like Wi‑Fi that affect everyone.\n\nAfter you create a new user, that person needs to go through a set-up process.\n\nAny user can accept updated app permissions on behalf of all other users."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"After you create a new user, that person needs to go through a setup process.\n\nAny user can accept updated app permissions on behalf of all other users."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Set up user now?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Make sure the person is available to take the tablet and set up their space"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Set up profile now?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"This setting affects all users on this phone."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Change language"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Change font size"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Restrictions:"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Remove restrictions"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Change PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Show notifications"</string>
     <string name="help_label" msgid="1107174367904110532">"Help"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Account for content"</string>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index ce76840c532..420ddaff008 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -72,7 +72,7 @@
     <item msgid="7553665153391107454">"Rápido"</item>
     <item msgid="1370673569131070146">"A mayor velocidad"</item>
     <item msgid="4648206845228970803">"A velocidad muy alta"</item>
-    <item msgid="4977949754169483251">"Rápido"</item>
+    <item msgid="4977949754169483251">"Veloz"</item>
     <item msgid="6106302964845503577">"Muy rápido"</item>
     <item msgid="6800277205640837264">"A velocidad máxima"</item>
   </string-array>
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Ubicación"</item>
     <item msgid="255608127647030286">"Personal"</item>
     <item msgid="4588829735729884491">"Mensajería"</item>
-    <item msgid="8971765125227378270">"Dispositivo"</item>
+    <item msgid="886742181977884584">"Medios"</item>
+    <item msgid="7924928667052300589">"Dispositivo"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"ubicación aproximada"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"reproducir audio"</item>
     <item msgid="8374996688066472414">"leer portapapeles"</item>
     <item msgid="3045529469061083747">"modificar portapapeles"</item>
+    <item msgid="5124443975763747838">"botones de medios"</item>
+    <item msgid="4547883971364273343">"enfoque de audio"</item>
+    <item msgid="2603878814882344450">"volumen principal"</item>
+    <item msgid="7136963238377062018">"volumen de voz"</item>
+    <item msgid="4270236897655923007">"volumen de tono"</item>
+    <item msgid="6325739889222559394">"volumen de medios"</item>
+    <item msgid="5762123934816216821">"volumen de alarma"</item>
+    <item msgid="785049718065337473">"volumen de notificación"</item>
+    <item msgid="6700305533746877052">"volumen de bluetooth"</item>
+    <item msgid="2029227495214047094">"mantener en funcionamiento"</item>
+    <item msgid="26109888160231211">"controlar ubicación"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Ubicación"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Reproducir audio"</item>
     <item msgid="136815868796597058">"Leer portapapeles"</item>
     <item msgid="5238692940326972503">"Modificar portapapeles"</item>
+    <item msgid="5753789168376302997">"Botones de medios"</item>
+    <item msgid="3265262911688671938">"Enfoque de audio"</item>
+    <item msgid="2098976479485046797">"Volumen principal"</item>
+    <item msgid="5660213838861789350">"Volumen de voz"</item>
+    <item msgid="7983336752371254444">"Volumen de tono"</item>
+    <item msgid="7878027809189330917">"Volumen de medios"</item>
+    <item msgid="7260546305036218513">"Volumen de alarma"</item>
+    <item msgid="9103719301075748925">"Volumen de notificación"</item>
+    <item msgid="7025966722295861512">"Volumen de Bluetooth"</item>
+    <item msgid="4665183401128289653">"Mantener en funcionamiento"</item>
+    <item msgid="8584357129746649222">"Ubicación"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Corto"</item>
     <item msgid="2560532955514699713">"Medio"</item>
     <item msgid="2372711992605524591">"Largo"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (depuración)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Usar Dalvik"</item>
+    <item msgid="5131846588686178907">"Usar ART"</item>
+    <item msgid="4530003713865319928">"Usar compilación de depuración de ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nunca comprobar"</item>
     <item msgid="6042769699089883931">"Comprobar contenido DRM solamente"</item>
@@ -367,9 +400,14 @@
     <item msgid="8272260411216018353">"En pantalla como líneas"</item>
     <item msgid="120512413928262547">"En adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Desactivado"</item>
+    <item msgid="7688197031296835369">"Mostrar áreas superpuestas"</item>
+    <item msgid="8332661909019981149">"Mostrar contador de superposiciones"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Límite estándar"</item>
-    <item msgid="4071574792028999443">"No hay procesos de fondo."</item>
+    <item msgid="4071574792028999443">"Ningún proceso en 2do plano"</item>
     <item msgid="4810006996171705398">"Máximo 1 proceso"</item>
     <item msgid="8586370216857360863">"Máximo 2 procesos"</item>
     <item msgid="836593137872605381">"Máximo 3 procesos"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 15305e882c7..a31a045f7b8 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -275,8 +275,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 tablet."</string>
-    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Al permitir el roaming de datos, los costos de roaming que deberás asumir pueden ser altos."\n\n"Esta configuración afecta a todos los usuarios de este dispositivo."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Al permitir el roaming de datos, los costos de roaming que deberás asumir pueden ser altos.\n\nEsta configuración afecta a todos los usuarios de esta tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Al permitir el roaming de datos, los costos de roaming que deberás asumir pueden ser altos.\n\nEsta configuración afecta a todos los usuarios de este dispositivo."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"¿Deseas permitir el roaming de datos?"</string>
     <string name="networks" msgid="6333316876545927039">"Selección de operador"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Elegir un operador de red"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Necesitas un PIN numérico o contraseña para descifrar tu tablet cada vez que la enciendes"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Se necesita un PIN numérico o contraseña para descifrar tu dispositivo cada vez que lo enciendes"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puedes encriptar tus cuentas, tus parámetros de configuración, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Una vez que hayas encriptado la tablet, debes ingresar un PIN o una contraseña numérica para desencriptarla cada vez que la enciendas. No puedes desencriptar tu tablet a menos que restablezcas su configuración de fábrica y borres, así, todos tus datos."\n\n"El proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con la batería cargada y mantener la tablet conectada hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Puedes encriptar tus cuentas, tus parámetros de configuración, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Luego de encriptar tu dispositivo, tienes que escribir un PIN o contraseña numéricos cada vez que lo enciendes para desencriptarlo. No puedes desencriptar tu dispositivo a menos que restablezcas su configuración de fábrica y borres, así, todos tus datos."\n\n"El proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con la batería cargada y mantener el dispositivo conectado hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puedes encriptar tus cuentas, tus parámetros de configuración, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Una vez que hayas encriptado la tablet, debes ingresar un PIN o una contraseña numérica para desencriptarla cada vez que la enciendas. No puedes desencriptar tu tablet a menos que restablezcas su configuración de fábrica y borres, así, todos tus datos.\n\nEl proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con la batería cargada y mantener la tablet conectada hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Puedes encriptar tus cuentas, tus parámetros de configuración, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Luego de encriptar tu dispositivo, tienes que escribir un PIN o contraseña numéricos cada vez que lo enciendes para desencriptarlo. No puedes desencriptar tu dispositivo a menos que restablezcas su configuración de fábrica y borres, así, todos tus datos.\n\nEl proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con la batería cargada y mantener el dispositivo conectado hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encriptar tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encriptar dispositivo"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carga tu batería e inténtalo nuevamente."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Vuelve a intentarlo en <xliff:g id="DELAY">^1</xliff:g> segundos."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Escribe la contraseña"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encriptación incorrecta"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"La encriptación se interrumpió y no se puede completar. Por esta razón, ya no es posible acceder a los datos de tu tablet. "\n\n" Para reanudar el uso de tu tablet, debes restablecer los datos de fábrica. Cuando configures tu tablet luego de restablecer los datos de fábrica, tendrás la posibilidad de restaurar los datos de los que tengas una copia de seguridad en tu cuenta de Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"La encriptación se interrumpió y no se puede completar. Por esta razón, ya no es posible acceder a los datos de tu dispositivo. "\n\n"Para reanudar el uso de tu dispositivo, debes restablecer los datos de fábrica. Cuando configures tu dispositivo luego de restablecer los datos de fábrica, tendrás la posibilidad de restaurar los datos de los que tengas una copia de seguridad en tu cuenta de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"La encriptación se interrumpió y no se puede completar. Por esta razón, ya no es posible acceder a los datos de tu tablet. \n\n Para reanudar el uso de tu tablet, debes restablecer los datos de fábrica. Cuando configures tu tablet luego de restablecer los datos de fábrica, tendrás la posibilidad de restaurar los datos de los que tengas una copia de seguridad en tu cuenta de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"La encriptación se interrumpió y no se puede completar. Por esta razón, ya no es posible acceder a los datos de tu dispositivo. \n\nPara reanudar el uso de tu dispositivo, debes restablecer los datos de fábrica. Cuando configures tu dispositivo luego de restablecer los datos de fábrica, tendrás la posibilidad de restaurar los datos de los que tengas una copia de seguridad en tu cuenta de Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Cambiar método de introducción"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Elegir bloqueo pant."</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Bloqueo alternativo"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Conectando"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Conectada"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponible"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"En uso"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Configuración de visualización"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"¿Desconectar?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Finalizará tu conexión con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;."</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desactivada"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"No disponible porque NFC está desactivada"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Cuando esta función está activada, puedes transmitir el contenido de las aplicaciones a otro dispositivo con la función NFC al juntar los dispositivos. Por ejemplo, puedes transmitir páginas del navegador, videos de YouTube, contactos y mucho más."\n\n"Solo tienes que unir los dispositivos (normalmente, por la parte trasera) y, a continuación, tocar la pantalla de tu dispositivo. La aplicación determina el contenido que se transmite."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Cuando esta función está activada, puedes transmitir el contenido de las aplicaciones a otro dispositivo con la función NFC al juntar los dispositivos. Por ejemplo, puedes transmitir páginas del navegador, videos de YouTube, contactos y mucho más.\n\nSolo tienes que unir los dispositivos (normalmente, por la parte trasera) y, a continuación, tocar la pantalla de tu dispositivo. La aplicación determina el contenido que se transmite."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Detección del servicio de red"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permitir a las aplicaciones de otros dispositivos ver las de este"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ninguna"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mejorar la precisión de la ubicación y para otros fines, <xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar la búsqueda de redes, incluso cuando la conexión Wi-Fi esté desactivada."\n\n"¿Quieres permitir esto para todas las aplicaciones que deseen buscar redes?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mejorar la precisión de la ubicación y para otros fines, <xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar la búsqueda de redes, incluso cuando la conexión Wi-Fi esté desactivada.\n\n¿Quieres permitir esto para todas las aplicaciones que deseen buscar redes?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Denegar"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
@@ -632,8 +633,8 @@
     <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 tablet puede requerir una significativa actividad de la red."</string>
-    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ADVERTENCIA: Es posible que tu proveedor te cobre cargos adicionales por el uso de datos."\n\n"La configuración del dispositivo puede requerir una significativa actividad de la red."</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ADVERTENCIA: Es posible que tu proveedor te cobre cargos adicionales por el uso de datos.\n\nLa configuración de la tablet puede requerir una significativa actividad de la red."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ADVERTENCIA: Es posible que tu proveedor te cobre cargos adicionales por el uso de datos.\n\nLa configuración del dispositivo puede requerir una significativa actividad de la red."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ADVERTENCIA: Hasta que no te conectes a Internet, la tablet no podrá verificar si el software está actualizado."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ADVERTENCIA: Hasta que no te conectes a Internet, el dispositivo no podrá verificar si el software está actualizado."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"La tablet no pudo conectarse a esta red Wi-Fi."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN de tarjeta SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN incorrecto"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Los PIN no coinciden"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"No se puede cambiar el PIN."\n"PIN posiblemente incorrecto."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"No se puede cambiar el PIN.\nPIN posiblemente incorrecto."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"El PIN de la tarjeta SIM se ha cambiado correctamente"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"No se puede cambiar el estado de bloqueo de la tarjeta SIM."\n"PIN posiblemente incorrecto."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"No se puede cambiar el estado de bloqueo de la tarjeta SIM.\nPIN posiblemente incorrecto."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Aceptar"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estado del tablet"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Restablecer valores de fábrica"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Borra todos los datos de la tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Borra todos los datos del dispositivo"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Esto borrará todos los datos del "<b>"almacenamiento interno"</b>" de tu tablet, por ejemplo:"\n\n<li>"tu cuenta de Google"</li>\n<li>"los datos y la configuración del sistema y de las aplicaciones"</li>\n<li>"las aplicaciones descargadas"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del dispositivo, por ejemplo:"\n\n<li>"tu cuenta de Google,"</li>\n<li>"datos de aplicaciones y ajustes del sistema,"</li>\n<li>"las aplicaciones descargadas."</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente has accedido a las siguientes cuentas:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Esto borrará todos los datos del "<b>"almacenamiento interno"</b>" de tu tablet, por ejemplo:\n\n"<li>"tu cuenta de Google"</li>\n<li>"los datos y la configuración del sistema y de las aplicaciones"</li>\n<li>"las aplicaciones descargadas"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del dispositivo, por ejemplo:\n\n"<li>"tu cuenta de Google,"</li>\n<li>"datos de aplicaciones y ajustes del sistema,"</li>\n<li>"las aplicaciones descargadas."</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente has accedido a las siguientes cuentas:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para borrar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para borrar música, imágenes y otros datos del usuario, debes borrar la "<b>"tarjeta SD"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar procesos almacenados en la memoria caché"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer preferencias"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"¿Restablec. preferencias?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Se restablecerán las preferencias de:"\n\n" "<li>"aplicaciones desactivadas,"</li>\n" "<li>"notificaciones de aplicaciones desactivadas,"</li>\n" "<li>"aplicaciones predeterminadas para diferentes acciones,"</li>\n" "<li>"restricciones de datos en segundo plano para las aplicaciones."</li>\n\n" No perderás los datos de ninguna aplicación."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Se restablecerán las preferencias de:\n\n "<li>"aplicaciones desactivadas,"</li>\n" "<li>"notificaciones de aplicaciones desactivadas,"</li>\n" "<li>"aplicaciones predeterminadas para diferentes acciones,"</li>\n" "<li>"restricciones de datos en segundo plano para las aplicaciones."</li>\n\n" No perderás los datos de ninguna aplicación."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Restablecer aplicaciones"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Administrar el espacio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para cambiar, presiona Ctrl+espacio."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predeterminado"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Diseños de teclado"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diccionario del usuario"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Diccionario personal"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Diccionarios personales"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Diccionario personal"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Agregar"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Agregar al diccionario"</string>
@@ -1303,6 +1302,11 @@
     <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 el dispositivo se esté cargando."</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Habilitar el registro de búsqueda de HCI de Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos los paquetes de HCI de Bluetooth en un archivo"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Tiempo de ejecución"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Tiempo de ejecución"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"¿Reiniciar para cambiar el tiempo de ejecución de <xliff:g id="OLD">%1$s</xliff:g> a <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Ubicaciones de prueba"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubicaciones de prueba"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"¿Permitir depuración por USB?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Proteger almacenamiento USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Las aplicaciones deben pedir permiso para leer el USB."</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"¿Proteger almacenamiento USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Cuando el almacenamiento USB está protegido, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo."\n\n"Es posible que algunas aplicaciones no funcionen hasta que los programadores las actualicen."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Cuando el almacenamiento USB está protegido, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo.\n\nEs posible que algunas aplicaciones no funcionen hasta que los programadores las actualicen."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Proteger tarjeta SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Las aplicaciones deben pedir permiso para leer la tarjeta SD."</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"¿Proteger tarjeta SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Cuando la tarjeta SD está protegida, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo."\n\n"Es posible que algunas aplicaciones no funcionen hasta que los programadores las actualicen."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Cuando la tarjeta SD está protegida, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo.\n\nEs posible que algunas aplicaciones no funcionen hasta que los programadores las actualicen."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal local"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Habilitar aplicac. de terminal que ofrece acceso al shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Elegir gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Elegir control"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"¿Deseas crear el widget y permitir el acceso?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Servicios"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</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_screen_magnification_summary" msgid="2380627654189671754">"Cuando esta función está activada, puedes acercar y alejar la imagen con solo tocar tres veces la pantalla.\n\nA continuación se indican las acciones que puedes hacer con la imagen acercada.\n"<ul><li>"Desplazar la imagen: arrastra dos o más dedos por la pantalla."</li>\n<li>"Modificar el nivel de zoom: une dos o más dedos o sepáralos."</li></ul>\n\n"También puedes ampliar el contenido seleccionado de forma temporal con solo tocar la pantalla tres veces y mantenerla presionada. Con el contenido ampliado, puedes arrastrar el dedo para explorar diferentes partes de la pantalla. Levanta el dedo para volver al estado anterior.\n\nNota: Puedes tocar tres veces la pantalla para ampliar el contenido en cualquier parte, excepto en el teclado y en la barra de navegación."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Acceso directo a la accesibilidad"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Encendido"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desactivada"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Cuando esta función está activada, puedes activar las funciones de accesibilidad rápidamente en dos pasos."\n\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_global_gesture_preference_description" msgid="750438015254396963">"Cuando esta función está activada, puedes activar las funciones de accesibilidad rápidamente en dos pasos.\n\nPaso 1: mantén presionado el botón de encendido hasta que oigas un sonido o notes una vibración.\n\nPaso 2: mantén la pantalla presionada con dos dedos hasta que oigas una confirmación.\n\nSi el dispositivo tiene varios usuarios, este acceso directo en la pantalla bloqueada permite habilitar la accesibilidad de forma temporal hasta que el dispositivo se desbloquea."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Texto grande"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ampliación de pantalla"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualizar automáticamente la ampliación de pantalla"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack permite que los usuarios con baja visión y no videntes oigan en voz alta las acciones que realizan. ¿Deseas instalarlo gratis desde Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No se proporcionó ninguna descripción."</string>
     <string name="settings_button" msgid="3006713718908152930">"Configuración"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Impresión"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Config. de impresión"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Servicios"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"¿Quieres usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> puede recibir los documentos que imprimes. Estos documentos pueden contener información confidencial."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"No se instaló ningún servicio."</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Configuración"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Agregar impresoras"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Sí"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"No"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batería"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Lo que ha utilizado la batería"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Sin datos de uso de batería"</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi en funcionamiento"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Teléfono"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Datos enviados"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Datos recibidos"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Datos móviles enviados"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Datos móviles recibidos"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Datos Wi‑Fi enviados"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Datos Wi‑Fi recibidos"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tiempo de activación"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Sonido"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afecta el tono del texto hablado"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Idioma no seleccionado"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Establece la voz específica de un idioma para el texto hablado"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Escucha un ejemplo:"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproducir una pequeña demostración de síntesis de voz"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP no es compatible."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"No puedes configurar una conexión Wi-Fi con EAP durante la configuración. Luego, puedes hacerlo en Conexiones inalámbricas y redes, en Configuración."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"La conexión puede demorar unos minutos..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toca "<b>"Siguiente"</b>" para continuar con la configuración."\n\n"Toca "<b>"Volver"</b>" para conectarte a otra red Wi‑Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toca "<b>"Siguiente"</b>" para continuar con la configuración.\n\nToca "<b>"Volver"</b>" para conectarte a otra red Wi‑Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronización habilitada"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronización inhabilitada"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Error de sincronización"</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Calendario"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Contactos"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Te damos la bienvenida a Google Sync"</font>"  "\n"Con este software de Google, puedes sincronizar tus datos y acceder a tus contactos, citas y más desde cualquier lugar."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Te damos la bienvenida a Google Sync"</font>"  \nCon este software de Google, puedes sincronizar tus datos y acceder a tus contactos, citas y más desde cualquier lugar."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Conf. de sincronización de aplicación"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Sincronización y datos"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Cambiar contraseña"</string>
@@ -1676,8 +1695,7 @@
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Mostrar vistas de ventanas procesadas con GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Ver actualiz. de capas de hardware"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Luz verde en capas de hardware al actualizarse"</string>
-    <string name="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="debug_hw_overdraw" msgid="2968692419951565417">"Depurar superpos. con GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Desactivar superpos. HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Usar GPU para combinar pantallas"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Seguimientos de OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Desactivar datos ref. en redes móviles (usará redes no móviles)"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Para restringir datos en 2.° plano aquí, limita datos móviles."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"¿Restringir el uso de datos en segundo plano?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Esta función puede hacer que deje de funcionar una aplicación que tenga que utilizar datos en segundo plano cuando solo estén disponibles redes móviles."\n\n"Puedes encontrar controles de uso de datos más adecuados en las opciones de configuración disponibles en la aplicación."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Esta función puede hacer que deje de funcionar una aplicación que tenga que utilizar datos en segundo plano cuando solo estén disponibles redes móviles.\n\nPuedes encontrar controles de uso de datos más adecuados en las opciones de configuración disponibles en la aplicación."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Solo se pueden restringir los datos en segundo plano si estableciste un límite de datos móviles."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"¿Activar sinc. automática?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Cualquier cambio que sufran tus cuentas en la Web se copiará automáticamente en tu tablet."\n\n"Algunas cuentas también pueden copiar automáticamente en la Web los cambios que sufre tu tablet. Una cuenta de Google funciona de esta manera."\n\n"Para elegir qué tipo de información sincronizar dentro de cada cuenta, ve a Configuración &gt; Cuentas."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Cualquier cambio que sufran tus cuentas en la Web se copiará automáticamente en tu dispositivo."\n\n"Algunas cuentas también pueden copiar automáticamente en la Web los cambios que sufre tu dispositivo. Una cuenta de Google funciona de esta manera."\n\n"Para elegir qué tipo de información sincronizar dentro de cada cuenta, ve a Configuración &gt; Cuentas."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Cualquier cambio que sufran tus cuentas en la Web se copiará automáticamente en tu tablet.\n\nAlgunas cuentas también pueden copiar automáticamente en la Web los cambios que sufre tu tablet. Una cuenta de Google funciona de esta manera.\n\nPara elegir qué tipo de información sincronizar dentro de cada cuenta, ve a Configuración &gt; Cuentas."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Cualquier cambio que sufran tus cuentas en la Web se copiará automáticamente en tu dispositivo.\n\nAlgunas cuentas también pueden copiar automáticamente en la Web los cambios que sufre tu dispositivo. Una cuenta de Google funciona de esta manera.\n\nPara elegir qué tipo de información sincronizar dentro de cada cuenta, ve a Configuración &gt; Cuentas."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"¿Desactivar sinc. automática?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Así ahorrarás datos y energía, pero tendrás que sincronizar cada cuenta manualmente para recopilar la información reciente. Por otro lado, no se te notificarán las actualizaciones."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Fecha de restablecimiento del ciclo de uso"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Configurar advertencia acerca del uso de datos"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Establecer el límite de uso de datos"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitar el uso de datos"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Tu conexión de datos móvil se desactivará cuando se alcance el límite especificado."\n\n"Debido a que el uso de datos medido por tu tablet puede diferir del cálculo de uso de tu proveedor, considera usar un límite prudente."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Tu conexión de datos móvil se desactivará cuando se alcance el límite especificado."\n\n"Debido a que el uso de datos medido por tu teléfono puede diferir del cálculo de uso de tu proveedor, considera usar un límite prudente."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Tu conexión de datos móvil se desactivará cuando se alcance el límite especificado.\n\nDebido a que el uso de datos medido por tu tablet puede diferir del cálculo de uso de tu proveedor, considera usar un límite prudente."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Tu conexión de datos móvil se desactivará cuando se alcance el límite especificado.\n\nDebido a que el uso de datos medido por tu teléfono puede diferir del cálculo de uso de tu proveedor, considera usar un límite prudente."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"¿Restringir el uso de datos en segundo plano?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Si restringes los datos móviles en segundo plano, algunas aplicaciones y servicios no funcionarán a menos que te conectes a una red Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Si restringes los datos móviles en segundo plano, algunos servicios y aplicaciones no funcionarán a menos que te conectes a una red Wi-Fi."\n\n"Esta configuración afecta a todos los usuarios de esta tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Si restringes los datos móviles en segundo plano, algunos servicios y aplicaciones no funcionarán a menos que te conectes a una red Wi-Fi."\n\n"Esta configuración afecta a todos los usuarios de este dispositivo."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Si restringes los datos móviles en segundo plano, algunos servicios y aplicaciones no funcionarán a menos que te conectes a una red Wi-Fi.\n\nEsta configuración afecta a todos los usuarios de esta tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Si restringes los datos móviles en segundo plano, algunos servicios y aplicaciones no funcionarán a menos que te conectes a una red Wi-Fi.\n\nEsta configuración afecta a todos los usuarios de este dispositivo."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"advertencia"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"límite"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicaciones eliminadas"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuario"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restringido"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Agregar usuario nuevo"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Puedes crear usuarios adicionales para compartir este dispositivo con otras personas. Cada usuario cuenta con su propio espacio y puede personalizarlo con sus propios fondos de pantalla, aplicaciones, etc. Los usuarios también pueden cambiar ciertos parámetros de configuración de la tablet como, por ejemplo, la red Wi-Fi, que afectan a todos."\n\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_add_user_message_long" msgid="3086244205384741788">"Puedes crear usuarios adicionales para compartir este dispositivo con otras personas. Cada usuario cuenta con su propio espacio y puede personalizarlo con sus propios fondos de pantalla, aplicaciones, etc. Los usuarios también pueden cambiar ciertos parámetros de configuración de la tablet como, por ejemplo, la red Wi-Fi, que afectan a todos.\n\nLuego de que crees un usuario nuevo, este tiene que pasar por un proceso de configuración.\n\nCualquier usuario puede aceptar permisos de aplicaciones actualizados en nombre del resto de los usuarios."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Luego de que crees un usuario nuevo, este tiene que pasar por un proceso de configuración.\n\nCualquier usuario puede aceptar permisos de aplicaciones actualizados en nombre del resto de los usuarios."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"¿Configurar el usuario ahora?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Asegúrate de que la persona esté disponible para aceptar la tablet y configurar su espacio."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"¿Quieres configurar tu perfil ahora?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuración afecta a todos los usuarios de este dispositivo."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Cambiar idioma"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Cambiar tamaño de fuente"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Restricciones"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Eliminar restricciones"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Cambiar PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificaciones"</string>
     <string name="help_label" msgid="1107174367904110532">"Ayuda"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Cuenta para contenido"</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index fe1cf2ee284..7616c68786f 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -72,9 +72,9 @@
     <item msgid="7553665153391107454">"Rápida"</item>
     <item msgid="1370673569131070146">"Más rápida"</item>
     <item msgid="4648206845228970803">"Muy rápida"</item>
-    <item msgid="4977949754169483251">"Rápida"</item>
-    <item msgid="6106302964845503577">"Muy rápida"</item>
-    <item msgid="6800277205640837264">"La más rápida"</item>
+    <item msgid="4977949754169483251">"Superrápida"</item>
+    <item msgid="6106302964845503577">"Hiperrrápida"</item>
+    <item msgid="6800277205640837264">"Lo más rápido posible"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Muy bajo"</item>
@@ -128,7 +128,7 @@
     <item msgid="435667726254379514">"PWD"</item>
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
-    <item msgid="5085064298144493867">"Botón push"</item>
+    <item msgid="5085064298144493867">"Botón WPS"</item>
     <item msgid="1624323946324499595">"PIN del otro dispositivo"</item>
     <item msgid="5366790421523328066">"PIN del dispositivo"</item>
   </string-array>
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Ubicación"</item>
     <item msgid="255608127647030286">"Personal"</item>
     <item msgid="4588829735729884491">"Mensajes"</item>
-    <item msgid="8971765125227378270">"Dispositivo"</item>
+    <item msgid="886742181977884584">"Multimedia"</item>
+    <item msgid="7924928667052300589">"Dispositivo"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"ubicación común"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"reproducir audio"</item>
     <item msgid="8374996688066472414">"leer portapapeles"</item>
     <item msgid="3045529469061083747">"modificar portapapeles"</item>
+    <item msgid="5124443975763747838">"botones multimedia"</item>
+    <item msgid="4547883971364273343">"foco de audio"</item>
+    <item msgid="2603878814882344450">"volumen principal"</item>
+    <item msgid="7136963238377062018">"volumen de la voz"</item>
+    <item msgid="4270236897655923007">"volumen del tono"</item>
+    <item msgid="6325739889222559394">"volumen multimedia"</item>
+    <item msgid="5762123934816216821">"volumen de la alarma"</item>
+    <item msgid="785049718065337473">"volumen de las notificaciones"</item>
+    <item msgid="6700305533746877052">"volumen de Bluetooth"</item>
+    <item msgid="2029227495214047094">"mantener activo"</item>
+    <item msgid="26109888160231211">"controlar ubicación"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Ubicación"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Reproducir audio"</item>
     <item msgid="136815868796597058">"Leer portapapeles"</item>
     <item msgid="5238692940326972503">"Modificar portapapeles"</item>
+    <item msgid="5753789168376302997">"Botones multimedia"</item>
+    <item msgid="3265262911688671938">"Foco de audio"</item>
+    <item msgid="2098976479485046797">"Volumen principal"</item>
+    <item msgid="5660213838861789350">"Volumen de la voz"</item>
+    <item msgid="7983336752371254444">"Volumen del tono"</item>
+    <item msgid="7878027809189330917">"Volumen multimedia"</item>
+    <item msgid="7260546305036218513">"Volumen de alarma"</item>
+    <item msgid="9103719301075748925">"Volumen de notificaciones"</item>
+    <item msgid="7025966722295861512">"Volumen de Bluetooth"</item>
+    <item msgid="4665183401128289653">"Mantener activo"</item>
+    <item msgid="8584357129746649222">"Ubicación"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Corto"</item>
     <item msgid="2560532955514699713">"Medio"</item>
     <item msgid="2372711992605524591">"Largo"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (depuración)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Usar Dalvik"</item>
+    <item msgid="5131846588686178907">"Usar ART"</item>
+    <item msgid="4530003713865319928">"Usar compilación de depuración de ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"No comprobar"</item>
     <item msgid="6042769699089883931">"Buscar solo contenido DRM"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"En pantalla como líneas"</item>
     <item msgid="120512413928262547">"En adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"No"</item>
+    <item msgid="7688197031296835369">"Mostrar áreas sobredibujadas"</item>
+    <item msgid="8332661909019981149">"Mostrar contador de sobredibujos"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Límite estándar"</item>
     <item msgid="4071574792028999443">"Sin procesos en segundo plano"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b6565b3729a..e3593a04fb5 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Al permitir la itinerancia de datos, los costes de itinerancia que deberás asumir pueden ser significativos.\n\nEsta configuración afecta a todos los usuarios de este tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Al permitir la itinerancia de datos, los costes de itinerancia que deberás asumir pueden ser significativos.\n\nEsta configuración afecta a todos los usuarios de este teléfono."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"¿Permitir itinerancia de datos?"</string>
     <string name="networks" msgid="6333316876545927039">"Selección de operador"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Seleccionar un operador de red"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Solicitar una contraseña o un PIN numérico para descifrar el tablet cada vez que se encienda"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Solicitar una contraseña o un PIN numérico para descifrar el teléfono cada vez que se encienda"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puedes encriptar tus cuentas, tus ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Cuando hayas encriptado el tablet, debes introducir un PIN o una contraseña para descifrarlo cada vez que lo enciendas. Solo podrás deshacer la operación restableciendo los datos de fábrica y borrando todos los datos del tablet."\n\n"El proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con una batería cargada y mantener el tablet conectado hasta que acabe. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Puedes encriptar tus cuentas, tus ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Cuando hayas encriptado el teléfono, debes introducir un PIN o una contraseña para descifrarlo cada vez que lo enciendas. Solo podrás deshacer la operación restableciendo los datos de fábrica y borrando todos los datos del teléfono."\n\n"El proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con una batería cargada y mantener el teléfono conectado hasta que acabe. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puedes encriptar tus cuentas, tus ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Cuando hayas encriptado el tablet, debes introducir un PIN o una contraseña para descifrarlo cada vez que lo enciendas. Solo podrás deshacer la operación restableciendo los datos de fábrica y borrando todos los datos del tablet.\n\nEl proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con una batería cargada y mantener el tablet conectado hasta que acabe. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Puedes encriptar tus cuentas, tus ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Cuando hayas encriptado el teléfono, debes introducir un PIN o una contraseña para descifrarlo cada vez que lo enciendas. Solo podrás deshacer la operación restableciendo los datos de fábrica y borrando todos los datos del teléfono.\n\nEl proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con una batería cargada y mantener el teléfono conectado hasta que acabe. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encriptar tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encriptar teléfono"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carga la batería y vuelve a intentarlo."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Espera <xliff:g id="DELAY">^1</xliff:g> segundos y vuelve a intentarlo."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Escribe tu contraseña"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Error en la encriptación"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"El proceso de encriptación se ha interrumpido y no se puede completar. Por tanto, no podrás volver a acceder a los datos del tablet. "\n\n"Debes restablecer los datos de fábrica para volver a usar el tablet. Cuando configures el tablet después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"La encriptación se ha interrumpido y no se puede completar. Por tanto, no podrás volver a acceder a los datos del teléfono. "\n\n"Debes restablecer los datos de fábrica para volver a usar el teléfono. Cuando configures el teléfono después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"El proceso de encriptación se ha interrumpido y no se puede completar. Por tanto, no podrás volver a acceder a los datos del tablet. \n\nDebes restablecer los datos de fábrica para volver a usar el tablet. Cuando configures el tablet después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"La encriptación se ha interrumpido y no se puede completar. Por tanto, no podrás volver a acceder a los datos del teléfono. \n\nDebes restablecer los datos de fábrica para volver a usar el teléfono. Cuando configures el teléfono después de este proceso, podrás restaurar los datos de los que hayas hecho una copia de seguridad en tu cuenta de Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Cambiar método de entrada"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Elegir bloqueo de pantalla"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Bloqueo alternativo"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Conectando"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Conectada"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponible"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"En uso"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Ajustes de pantalla"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"¿Desconectar?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Finalizará la conexión con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;."</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desactivada"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"No disponible porque la función NFC está desactivada"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Si la función Android Beam está activada, puedes juntar tu dispositivo con otro compatible con la tecnología NFC para compartir el contenido de las aplicaciones. Por ejemplo, puedes transferir páginas del navegador, vídeos de YouTube, contactos y mucho más."\n\n"Solo tienes que unir los dispositivos (normalmente, por la parte trasera) y, a continuación, tocar la pantalla de tu dispositivo. Las aplicaciones determinan el contenido que puede compartirse."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Si la función Android Beam está activada, puedes juntar tu dispositivo con otro compatible con la tecnología NFC para compartir el contenido de las aplicaciones. Por ejemplo, puedes transferir páginas del navegador, vídeos de YouTube, contactos y mucho más.\n\nSolo tienes que unir los dispositivos (normalmente, por la parte trasera) y, a continuación, tocar la pantalla de tu dispositivo. Las aplicaciones determinan el contenido que puede compartirse."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Detección de aplicaciones"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permitir que las aplicaciones de otros dispositivos puedan ver las aplicaciones de este dispositivo"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ninguna"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mejorar la precisión de la ubicación y para otros fines, <xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar la búsqueda de redes aunque la conexión Wi-Fi esté desactivada."\n\n"¿Permitir para todas las aplicaciones que quieran buscar redes?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mejorar la precisión de la ubicación y para otros fines, <xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar la búsqueda de redes aunque la conexión Wi-Fi esté desactivada.\n\n¿Permitir para todas las aplicaciones que quieran buscar redes?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Rechazar"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Establecer conexión"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"ADVERTENCIA: es posible que se facturen cargos de datos adicionales.\n\nLa configuración del tablet puede requerir una gran cantidad de actividad de red."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ADVERTENCIA: es posible que se facturen cargos de datos adicionales.\n\nLa configuración del teléfono puede requerir una gran cantidad de actividad de red."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ADVERTENCIA: hasta que no tengas conexión a Internet, el tablet no podrá verificar si el software está actualizado."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ADVERTENCIA: hasta que no tengas conexión a Internet, el teléfono no podrá verificar si el software está actualizado."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"El tablet no se ha podido conectar a esta red Wi-Fi."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN de tarjeta SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN incorrecto"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Los números PIN no coinciden."</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"No se puede modificar el PIN."\n"Es posible que el PIN no sea correcto."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"No se puede modificar el PIN.\nEs posible que el PIN no sea correcto."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"El PIN de la tarjeta SIM se ha modificado correctamente."</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"No se puede modificar el estado de bloqueo de la tarjeta SIM."\n"Es posible que el PIN no sea correcto."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"No se puede modificar el estado de bloqueo de la tarjeta SIM.\nEs posible que el PIN no sea correcto."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Aceptar"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estado del tablet"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Restablecer datos de fábrica"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Borra todos los datos del tablet."</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Borrar todos los datos del teléfono"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del tablet, como:"\n\n<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, como:"\n\n<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Has accedido a las cuentas que se indican a continuación:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del tablet, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Has accedido a las cuentas que se indican a continuación:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, deber borrar la "<b>"tarjeta SD"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Procesos en caché"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer preferencias"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"¿Restablecer preferencias?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Se restablecerán todas las preferencias de:"\n\n" "<li>"Aplicaciones inhabilitadas"</li>\n" "<li>"Notificaciones de aplicaciones inhabilitadas"</li>\n" "<li>"Aplicaciones para acciones predeterminadas"</li>\n" "<li>"Restricciones de conexiones automáticas para aplicaciones"</li>\n\n"No perderás los datos de las aplicaciones."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Se restablecerán todas las preferencias de:\n\n "<li>"Aplicaciones inhabilitadas"</li>\n" "<li>"Notificaciones de aplicaciones inhabilitadas"</li>\n" "<li>"Aplicaciones para acciones predeterminadas"</li>\n" "<li>"Restricciones de conexiones automáticas para aplicaciones"</li>\n\n"No perderás los datos de las aplicaciones."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Restablecer aplicaciones"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Administrar espacio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrar"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para cambiar, pulsa Ctrl+espacio."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predeterminado"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Diseños de teclado"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diccionario del usuario"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Diccionario personal"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Diccionarios personales"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Diccionario personal"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Añadir"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Añadir al diccionario"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Incluir opción en el menú de encendido para generar un informe de error"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Pantalla activa"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla nunca entra en modo de suspensión si el dispositivo se está cargando"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Habilitar registro de búsqueda de HCI de Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos los paquetes de HCI de Bluetooth HCI en un archivo"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Elegir tiempo de ejecución"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Elegir tiempo de ejecución"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"¿Reiniciar para cambiar el tiempo de ejecución de <xliff:g id="OLD">%1$s</xliff:g> a <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Ubicaciones simuladas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubicaciones simuladas"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"¿Permitir depuración USB?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Proteger almacenamiento USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Las aplicaciones deben solicitar permiso para leer el almacenamiento USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"¿Proteger almacenamiento USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Cuando el almacenamiento USB está protegido, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo."\n\n"Es posible que algunas aplicaciones no funcionen hasta que los desarrolladores las actualicen."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Cuando el almacenamiento USB está protegido, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo.\n\nEs posible que algunas aplicaciones no funcionen hasta que los desarrolladores las actualicen."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Proteger tarjeta SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Las aplicaciones deben solicitar permiso para leer la tarjeta SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"¿Proteger tarjeta SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Cuando la tarjeta SD está protegida, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo."\n\n"Es posible que algunas aplicaciones no funcionen hasta que los desarrolladores las actualicen."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Cuando la tarjeta SD está protegida, las aplicaciones deben solicitar permiso para leer los datos del almacenamiento externo.\n\nEs posible que algunas aplicaciones no funcionen hasta que los desarrolladores las actualicen."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal local"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Habilitar aplicación de terminal que ofrece acceso a shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Seleccionar gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Seleccionar widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"¿Crear widget y permitir acceso?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Servicios"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</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_screen_magnification_summary" msgid="2380627654189671754">"Cuando esta función está activada, puedes acercar y alejar la imagen con solo tocar tres veces la pantalla.\n\nA continuación se indican las acciones que puedes hacer con la imagen acercada.\n"<ul><li>"Desplazar la imagen: arrastra dos o más dedos por la pantalla."</li>\n<li>"Modificar el nivel de zoom: une dos o más dedos o sepáralos."</li></ul>\n\n"También puedes ampliar el contenido seleccionado de forma temporal con solo tocar la pantalla tres veces y mantenerla pulsada. Con el contenido ampliado, puedes arrastrar el dedo para explorar diferentes partes de la pantalla. Levanta el dedo para volver al estado anterior.\n\nNota: puedes tocar tres veces la pantalla para ampliar el contenido en cualquier parte, excepto en el teclado y en la barra de navegación."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Acceso directo a accesibilidad"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Sí"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desactivada"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Cuando esta función está activada, puedes habilitar las funciones de accesibilidad rápidamente en dos pasos."\n\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_global_gesture_preference_description" msgid="750438015254396963">"Cuando esta función está activada, puedes habilitar las funciones de accesibilidad rápidamente en dos pasos.\n\nPaso 1: mantén pulsado el botón de encendido hasta que escuches un sonido o notes una vibración.\n\nPaso 2: mantén la pantalla pulsada con dos dedos hasta que escuches una confirmación.\n\nSi hay varios usuarios en el dispositivo, este acceso directo en la pantalla de bloqueo permite habilitar la accesibilidad de forma temporal hasta que el dispositivo se desbloquea."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Texto grande"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ampliación de pantalla"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualizar ampliación automáticamente"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack ofrece mensajes de voz para usuarios con discapacidades visuales. ¿Quieres instalarlo de forma gratuita desde Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No se ha especificado ninguna descripción."</string>
     <string name="settings_button" msgid="3006713718908152930">"Ajustes"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Impresión"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Ajustes de impresión"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Servicios"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"¿Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> puede recibir los documentos que imprimes. Esos documentos pueden contener información confidencial."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"No se ha instalado ningún servicio."</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Ajustes"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Añadir impresoras"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"On"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Off"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batería"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Consumo de la batería"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Los datos de uso de la batería no están disponibles"</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi‑Fi activado"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Teléfono"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Datos enviados"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Datos recibidos"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Datos móviles enviados"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Datos móviles recibidos"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Datos Wi‑Fi enviados"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Datos Wi‑Fi recibidos"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Vídeo"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tiempo encendida"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tono"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afecta al tono del texto hablado."</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Idioma no seleccionado"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Establecer la voz del idioma específico para el texto hablado"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Escuchar un ejemplo"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproducir una breve demostración de síntesis de voz"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP no compatible"</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"No puedes definir una conexión Wi-Fi EAP durante la configuración, pero puedes hacerlo cuando haya finalizado a través de Ajustes &gt; Conexiones inalámbricas y redes."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Conectando (puede tardar unos minutos)…"</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toca "<b>"Siguiente"</b>" para continuar con el proceso de configuración."\n\n"Toca "<b>"Atrás"</b>" para conectarte a otra red Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toca "<b>"Siguiente"</b>" para continuar con el proceso de configuración.\n\nToca "<b>"Atrás"</b>" para conectarte a otra red Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronización habilitada"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronización inhabilitada"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Error de sincronización"</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Calendar"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Contactos"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Te damos la bienvenida a Google Sync,"</font>" "\n"un servicio de Google que te permite sincronizar datos para que puedas acceder a tus contactos, a tus citas, etc., desde cualquier ubicación."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Te damos la bienvenida a Google Sync,"</font>" \nun servicio de Google que te permite sincronizar datos para que puedas acceder a tus contactos, a tus citas, etc., desde cualquier ubicación."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Ajustes de sincronización de la aplicación"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Datos y sincronización"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Cambiar contraseña"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Depurar sobredibujos de GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Inhabilitar superposiciones HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Usar siempre GPU para combinar pantallas"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Habilitar seguimiento OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Inhabilitar conexiones automáticas en redes móviles (si es posible, se usarán otras)."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Para restringir las conexiones automáticas, establece un límite de datos móviles."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"¿Restringir conexiones automáticas?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Esta función puede hacer que deje de funcionar una aplicación que tenga que utilizar conexiones automáticas cuando solo haya disponibles redes móviles."\n\n"Puedes encontrar controles de uso de datos más adecuados en las opciones de configuración disponibles en la aplicación."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Esta función puede hacer que deje de funcionar una aplicación que tenga que utilizar conexiones automáticas cuando solo haya disponibles redes móviles.\n\nPuedes encontrar controles de uso de datos más adecuados en las opciones de configuración disponibles en la aplicación."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Solo puedes restringir las conexiones automáticas si estableces un límite de datos móviles."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"¿Activar sincronización automática?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Los cambios que hagas en tus cuentas en la Web se 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_on_dialog" product="tablet" msgid="7312283529426636845">"Los cambios que hagas en tus cuentas en la Web se reflejarán automáticamente en el tablet.\n\nAlgunas cuentas como, por ejemplo, las cuentas de Google, también reflejarán en la Web los cambios que hagas en el tablet. \n\nPara seleccionar qué tipo de información se sincronizará con cada cuenta, accede a Ajustes &gt; Cuentas."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Los cambios que hagas en tus cuentas en la Web se reflejarán automáticamente en el teléfono.\n\nAlgunas cuentas como, por ejemplo, las cuentas de Google, también reflejarán en la Web los cambios que hagas en el teléfono. \n\nPara seleccionar qué tipo de información se sincronizará con cada cuenta, accede a Ajustes &gt; Cuentas."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"¿Desactivar sincronización automática?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Esto te permitirá ahorrar datos y batería, pero tendrás que sincronizar cada cuenta de forma manual para recopilar información reciente y no recibirás notificaciones cuando se produzcan actualizaciones."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Elige el día en el que empezará cada ciclo"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Establecer advertencia de uso de datos"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Limitar uso de datos"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitar uso de datos"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Tu conexión de datos se inhabilitará cuando se alcance el límite especificado."\n\n"Como el tablet es el que calcula el uso de los datos y el cálculo del operador puede ser diferente, te recomendamos que uses un límite moderado."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Tu conexión de datos se inhabilitará cuando se alcance el límite especificado."\n\n"Como el teléfono es el que calcula los datos y el cálculo del operador puede ser diferente, te recomendamos que uses un límite moderado."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Tu conexión de datos se inhabilitará cuando se alcance el límite especificado.\n\nComo el tablet es el que calcula el uso de los datos y el cálculo del operador puede ser diferente, te recomendamos que uses un límite moderado."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Tu conexión de datos se inhabilitará cuando se alcance el límite especificado.\n\nComo el teléfono es el que calcula los datos y el cálculo del operador puede ser diferente, te recomendamos que uses un límite moderado."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"¿Restringir conexiones automáticas?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Si restringes las conexiones automáticas, algunas aplicaciones y algunos servicios no funcionarán sin conexión Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Si restringes las conexiones automáticas, algunas aplicaciones y algunos servicios no funcionarán sin conexión Wi-Fi."\n\n"Esta configuración afecta a todos los usuarios del tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Si restringes las conexiones automáticas, algunas aplicaciones y algunos servicios no funcionarán sin conexión Wi-Fi."\n\n"Esta configuración afecta a todos los usuarios del teléfono."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Si restringes las conexiones automáticas, algunas aplicaciones y algunos servicios no funcionarán sin conexión Wi-Fi.\n\nEsta configuración afecta a todos los usuarios del tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Si restringes las conexiones automáticas, algunas aplicaciones y algunos servicios no funcionarán sin conexión Wi-Fi.\n\nEsta configuración afecta a todos los usuarios del teléfono."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"aviso"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"límite"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicaciones eliminadas"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuario"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil limitado"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Añadir nuevo usuario"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Puedes crear más usuarios para compartir este dispositivo con otras personas. Cada usuario tiene su propio espacio y puede personalizarlo con sus propias aplicaciones, fondos de pantalla y muchas otras cosas. Asimismo, los usuarios pueden modificar las opciones de configuración del tablet, como la conexión Wi-Fi, que afectan a todos los usuarios."\n\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_add_user_message_long" msgid="3086244205384741788">"Puedes crear más usuarios para compartir este dispositivo con otras personas. Cada usuario tiene su propio espacio y puede personalizarlo con sus propias aplicaciones, fondos de pantalla y muchas otras cosas. Asimismo, los usuarios pueden modificar las opciones de configuración del tablet, como la conexión Wi-Fi, que afectan a todos los usuarios.\n\nDespués de crear un nuevo usuario, este debe completar un proceso de configuración.\n\nCualquier usuario puede aceptar permisos de aplicaciones actualizados en nombre del resto de los usuarios."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Cuendo añadas a un nuevo usuario, deberá completar un proceso de configuración.\n\nCualquier usuario puede aceptar permisos de aplicaciones actualizados en nombre del resto de usuarios."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"¿Configurar usuario ahora?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Comprueba que el usuario tiene acceso al tablet y puede configurar su espacio."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"¿Quieres configurar un perfil ahora?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuración afecta a todos los usuarios de este teléfono."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Cambiar idioma"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Cambiar tamaño de fuente"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Restricciones"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Eliminar restricciones"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Cambiar PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificaciones"</string>
     <string name="help_label" msgid="1107174367904110532">"Ayuda"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Cuenta para contenido"</string>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index e72eb1d4b44..9ad5ef18390 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Asukoht"</item>
     <item msgid="255608127647030286">"Isiklik"</item>
     <item msgid="4588829735729884491">"Sõnumside"</item>
-    <item msgid="8971765125227378270">"Seade"</item>
+    <item msgid="886742181977884584">"Meedia"</item>
+    <item msgid="7924928667052300589">"Seade"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"üldine asukoht"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"heli esitamine"</item>
     <item msgid="8374996688066472414">"lõikelaua lugemine"</item>
     <item msgid="3045529469061083747">"lõikelaua muutmine"</item>
+    <item msgid="5124443975763747838">"meedianupud"</item>
+    <item msgid="4547883971364273343">"helifookus"</item>
+    <item msgid="2603878814882344450">"põhihelitugevus"</item>
+    <item msgid="7136963238377062018">"hääle helitugevus"</item>
+    <item msgid="4270236897655923007">"helina helitugevus"</item>
+    <item msgid="6325739889222559394">"meedia helitugevus"</item>
+    <item msgid="5762123934816216821">"äratuse helitugevus"</item>
+    <item msgid="785049718065337473">"märguande helitugevus"</item>
+    <item msgid="6700305533746877052">"Bluetoothi helitugevus"</item>
+    <item msgid="2029227495214047094">"hoia ärkvel"</item>
+    <item msgid="26109888160231211">"monitori asukoht"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Asukoht"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Heli esitamine"</item>
     <item msgid="136815868796597058">"Lõikelaua lugemine"</item>
     <item msgid="5238692940326972503">"Lõikelaua muutmine"</item>
+    <item msgid="5753789168376302997">"Meedianupud"</item>
+    <item msgid="3265262911688671938">"Helifookus"</item>
+    <item msgid="2098976479485046797">"Põhihelitugevus"</item>
+    <item msgid="5660213838861789350">"Hääle helitugevus"</item>
+    <item msgid="7983336752371254444">"Helina helitugevus"</item>
+    <item msgid="7878027809189330917">"Meedia helitugevus"</item>
+    <item msgid="7260546305036218513">"Alarmi helitugevus"</item>
+    <item msgid="9103719301075748925">"Märguande helitugevus"</item>
+    <item msgid="7025966722295861512">"Bluetoothi helitugevus"</item>
+    <item msgid="4665183401128289653">"Hoia ärkvel"</item>
+    <item msgid="8584357129746649222">"Asukoht"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Lühike"</item>
     <item msgid="2560532955514699713">"Keskmine"</item>
     <item msgid="2372711992605524591">"Pikk"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (silumine)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Kasuta tarkvara Dalvik"</item>
+    <item msgid="5131846588686178907">"Kasuta valikut ART"</item>
+    <item msgid="4530003713865319928">"Kasuta valiku ART silumisjärku"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Ära kunagi kontrolli"</item>
     <item msgid="6042769699089883931">"Kontrolli ainult DRM-sisu"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Ekraanil joontena"</item>
     <item msgid="120512413928262547">"Adb-kestas dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Väljas"</item>
+    <item msgid="7688197031296835369">"Kuva ülejoonistatud alad"</item>
+    <item msgid="8332661909019981149">"Kuva ülejoonistuse loendur"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardpiir"</item>
     <item msgid="4071574792028999443">"Taustaprotsessideta"</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index ef834188174..f8b0201de03 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Kui lubate andmeside rändluse, siis võivad sellega kaasneda rändlustasud!\n\nSeade mõjutab tahvelarvuti kõiki kasutajaid."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Kui lubate andmeside rändluse, siis võivad sellega kaasneda rändlustasud!\n\nSeade mõjutab telefoni kõiki kasutajaid."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Kas lubada andmeside rändlus?"</string>
     <string name="networks" msgid="6333316876545927039">"Operaatori valik"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Võrguoperaatori valimine"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Igal telefoni sisselülitamisel on vaja numbrilist PIN-koodi või parooli tahvelarvuti dekrüpteerimiseks"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Igal telefoni sisselülitamisel on vaja numbrilist PIN-koodi või parooli telefoni dekrüpteerimiseks"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krüpteeritud"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Saate krüpteerida oma kontosid, seadeid, allalaaditud rakendusi ja nende andmeid ning meediumi- ja muid faile. Kui tahvelarvuti on krüpteeritud, peate iga kord seadet sisse lülitades selle dekrüpteerimiseks sisestama numbrilise PIN-koodi või parooli. Tahvelarvuti krüpteeringut ei saa tühistada, välja arvatud tehaseandmete lähtestamisega, millega kustutatakse kõik teie andmed."\n\n"Krüpteerimine võtab aega tunni või rohkem. Aku peab olema täis ja tahvelarvuti sisse lülitatud, kuni krüpteerimine on lõpule viidud. Kui katkestate krüpteerimistoimingu, kaotate osa või kõik oma andmed."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Saate krüpteerida oma kontosid, seadeid, allalaaditud rakendusi ja nende andmeid ning meediumi- ja muid faile. Kui telefon on krüpteeritud, peate iga kord seda sisse lülitades sisestama dekrüpteerimiseks numbrilise PIN-koodi või parooli. Telefoni krüpteeringut ei saa tühistada, välja arvatud tehaseandmete lähtestamisega, millega kustutatakse kõik teie andmed."\n\n"Krüpteerimine võtab aega tunni või rohkem. Aku peab olema täis ja telefon sisse lülitatud, kuni krüpteerimine on lõpule viidud. Kui katkestate krüpteerimistoimingu, kaotate osa andmeid või kõik andmed."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Saate krüpteerida oma kontosid, seadeid, allalaaditud rakendusi ja nende andmeid ning meediumi- ja muid faile. Kui tahvelarvuti on krüpteeritud, peate iga kord seadet sisse lülitades selle dekrüpteerimiseks sisestama numbrilise PIN-koodi või parooli. Tahvelarvuti krüpteeringut ei saa tühistada, välja arvatud tehaseandmete lähtestamisega, millega kustutatakse kõik teie andmed.\n\nKrüpteerimine võtab aega tunni või rohkem. Aku peab olema täis ja tahvelarvuti sisse lülitatud, kuni krüpteerimine on lõpule viidud. Kui katkestate krüpteerimistoimingu, kaotate osa või kõik oma andmed."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Saate krüpteerida oma kontosid, seadeid, allalaaditud rakendusi ja nende andmeid ning meediumi- ja muid faile. Kui telefon on krüpteeritud, peate iga kord seda sisse lülitades sisestama dekrüpteerimiseks numbrilise PIN-koodi või parooli. Telefoni krüpteeringut ei saa tühistada, välja arvatud tehaseandmete lähtestamisega, millega kustutatakse kõik teie andmed.\n\nKrüpteerimine võtab aega tunni või rohkem. Aku peab olema täis ja telefon sisse lülitatud, kuni krüpteerimine on lõpule viidud. Kui katkestate krüpteerimistoimingu, kaotate osa andmeid või kõik andmed."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Krüpteeri tahvelarvuti"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Krüpteeri telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laadige akut ja proovige uuesti."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Proovige uuesti <xliff:g id="DELAY">^1</xliff:g> sekundi pärast."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Sisestage parool"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Krüptimine ebaõnnestus"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krüpteerimine katkestati ja seda ei saa lõpule viia. Seetõttu ei pääse te enam oma tahvelarvutis olevatele andmetele juurde. "\n\n" Tahvelarvuti kasutamise jätkamiseks peate lähtestama selle tehaseseadetele. Kui seadistate tahvelarvutit pärast lähtestamist, saate taastada kõik andmed, mis olid varundatud teie Google\'i kontole."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krüpteerimine katkestati ja seda ei saa lõpule viia. Seetõttu ei pääse te enam oma telefonis olevatele andmetele juurde. "\n\n"Telefoni kasutamise jätkamiseks peate selle lähtestama tehaseseadetele. Kui seadistate telefoni pärast lähtestamist, saate taastada kõik andmed, mis olid varundatud teie Google\'i kontole."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krüpteerimine katkestati ja seda ei saa lõpule viia. Seetõttu ei pääse te enam oma tahvelarvutis olevatele andmetele juurde. \n\n Tahvelarvuti kasutamise jätkamiseks peate lähtestama selle tehaseseadetele. Kui seadistate tahvelarvutit pärast lähtestamist, saate taastada kõik andmed, mis olid varundatud teie Google\'i kontole."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krüpteerimine katkestati ja seda ei saa lõpule viia. Seetõttu ei pääse te enam oma telefonis olevatele andmetele juurde. \n\nTelefoni kasutamise jätkamiseks peate selle lähtestama tehaseseadetele. Kui seadistate telefoni pärast lähtestamist, saate taastada kõik andmed, mis olid varundatud teie Google\'i kontole."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Sisestusmeetodi vahetamine"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekraaniluku valimine"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Valige varukoopia lukk"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Ühendamine"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Ühendatud"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Saadaval"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Kasutusel"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Kuvaseaded"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Kas katkestada ühendus?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"See lõpetab teie ühenduse seadmega:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Väljas"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Pole saadaval, kuna NFC on välja lülitatud"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Kui see funktsioon on sisse lülitatud, saate rakenduse sisu teise NFC-suutlikku seadmesse kiirega saata, hoides seadmeid üksteise lähedal. Nii saate edastada näiteks brauserilehti, YouTube\'i videoid, inimeste kontakte ja muud."\n\n"Lihtsalt hoidke seadmeid lähestikku (tavaliselt tagused koos) ja siis puudutage seadme ekraani. Rakendus otsustab, mida kiirega edastatakse."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Kui see funktsioon on sisse lülitatud, saate rakenduse sisu teise NFC-suutlikku seadmesse kiirega saata, hoides seadmeid üksteise lähedal. Nii saate edastada näiteks brauserilehti, YouTube\'i videoid, inimeste kontakte ja muud.\n\nLihtsalt hoidke seadmeid lähestikku (tavaliselt tagused koos) ja siis puudutage seadme ekraani. Rakendus otsustab, mida kiirega edastatakse."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Võrguteenuse avastus"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Luba muudes seadmetes olevatel rakendustel selle seadme rakendusi leida"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"WiFi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Kaitstud turbega <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", kaitstud turbega <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Puudub"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Täpsema asukoha ja muude toimingute jaoks tahab rakendus <xliff:g id="APP_NAME">%1$s</xliff:g> võrkude skannimise sisse lülitada, isegi kui WiFi on välja lülitatud."\n\n"Kas lubada see kõigi rakenduste jaoks, mis skannida tahavad?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Täpsema asukoha ja muude toimingute jaoks tahab rakendus <xliff:g id="APP_NAME">%1$s</xliff:g> võrkude skannimise sisse lülitada, isegi kui WiFi on välja lülitatud.\n\nKas lubada see kõigi rakenduste jaoks, mis skannida tahavad?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Luba"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Keela"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Ühenda"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"HOIATUS: operaatoril võib andmeedastusele kehtida lisahind.\n\nTahvelarvuti seadistamiseks võib olla vajalik suur võrguaktiivsus."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"HOIATUS: operaatoril võib andmeedastusele kehtida lisahind.\n\nTelefoni seadistamiseks võib olla vajalik suur võrguaktiivsus."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"HOIATUS. Kuni teil puudub Interneti-ühendus, ei saa tahvelarvuti teie tarkvara ajakohasust kontrollida."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"HOIATUS. Kuni teil puudub Interneti-ühendus, ei saa te tarkvara ajakohasust kontrollida."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tahvelarvutil ei õnnestunud luua ühendust selle WiFi-võrguga."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM-i PIN-kood"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Vale PIN-kood"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN-koodid ei kattu"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"PIN-koodi ei saa muuta."\n"PIN-kood võib vale olla."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"PIN-koodi ei saa muuta.\nPIN-kood võib vale olla."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-i PIN-koodi muutmine õnnestus"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM-kaardi lukustusolekut ei saa muuta."\n"Võimalik, et PIN-kood on vale."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM-kaardi lukustusolekut ei saa muuta.\nVõimalik, et PIN-kood on vale."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Tühista"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tahvelarvuti olek"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Tehaseandmete lähtestamine"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Kustutab kõik tahvelarvutis olevad andmed"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Kustutab kõik andmed telefonis"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"See kustutab kõik andmed teie tahvelarvuti "<b>"sisemälust"</b>", sh:"\n\n<li>"teie Google\'i konto"</li>\n<li>"süsteemi ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"See kustutab kõik andmed telefoni "<b>"sisemälust"</b>", sh:"\n\n<li>"teie Google\'i konto"</li>\n<li>"süsteemi ja rakenduse andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olete praegu sisse logitud järgmistele kontodele:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"See kustutab kõik andmed teie tahvelarvuti "<b>"sisemälust"</b>", sh:\n\n"<li>"teie Google\'i konto"</li>\n<li>"süsteemi ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"See kustutab kõik andmed telefoni "<b>"sisemälust"</b>", sh:\n\n"<li>"teie Google\'i konto"</li>\n<li>"süsteemi ja rakenduse andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olete praegu sisse logitud järgmistele kontodele:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muusika"</li>\n<li>"Fotod"</li>\n<li>"Muud kasutajaandmed"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Muusika, piltide ja muu kasutajateabe kustutamiseks tuleb tühjendada ka "<b>"USB-mäluseade"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Muusika, piltide ja muude kasutajaandmete kustutamiseks tuleb tühjendada ka "<b>"SD-kaart"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Kuva vahemällu salvestatud protsessid"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Läht. rakend. eelistused"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Läht. rakend. eelistused?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"See lähtestab kõik eelistused rakendusele:"\n\n" "<li>"Keelatud rakendused"</li>\n" "<li>"Keelatud rakenduste teatised"</li>\n" "<li>"Vaikerakendused toimingutele"</li>\n" "<li>"Taustaandmete piirangud rakendustele"</li>\n\n" Te ei kaota mingeid rakenduse andmeid."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"See lähtestab kõik eelistused rakendusele:\n\n "<li>"Keelatud rakendused"</li>\n" "<li>"Keelatud rakenduste teatised"</li>\n" "<li>"Vaikerakendused toimingutele"</li>\n" "<li>"Taustaandmete piirangud rakendustele"</li>\n\n" Te ei kaota mingeid rakenduse andmeid."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Lähtesta rakendused"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Halda ruumi"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Vahetamiseks vajutage Ctrl+tühikut"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Vaikepaigutus"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Klaviatuuri paigutused"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kasutajasõnastik"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Isiklik sõnastik"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Isiklikud sõnastikud"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Isiklik sõnaraamat"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Lisa"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Lisa sõnastikku"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Kaasa toitemenüüs veaaruande tegemise valik"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Jää sisselülitatuks"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekraan ei lähe kunagi laadimise ajal unerežiimi"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Luba Bluetoothi HCI jälgimise logi"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Hõiva kõik faili Bluetoothi HCI paketid"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Käitusaja valimine"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Käitusaja valimine"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Taaskäivitage, et käitusaeg oleks <xliff:g id="OLD">%1$s</xliff:g>, mitte <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Luba võltsasukohti"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Luba võltsasukohti"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Luban USB silumise?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Kaitse USB-salvestusruumi"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Rakendused peavad USB-salvestusruumi lugemiseks loa taotlema"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Kas kaitsta USB-salvestusruumi?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Kui USB-salvestusruum on kaitstud, peavad rakendused välismäluseadmelt andmete lugemiseks loa taotlema."\n\n"Mõned rakendused ei pruugi töötada enne, kui arendaja on need värskendanud."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Kui USB-salvestusruum on kaitstud, peavad rakendused välismäluseadmelt andmete lugemiseks loa taotlema.\n\nMõned rakendused ei pruugi töötada enne, kui arendaja on need värskendanud."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Kaitse SD-kaarti"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Rakendused peavad SD-kaardi lugemiseks loa taotlema"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Kas kaitsta SD-kaarti?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Kui SD-kaart on kaitstud, peavad rakendused välismäluseadmelt andmete lugemiseks loa taotlema."\n\n"Mõned rakendused ei pruugi töötada enne, kui arendaja on need värskendanud."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Kui SD-kaart on kaitstud, peavad rakendused välismäluseadmelt andmete lugemiseks loa taotlema.\n\nMõned rakendused ei pruugi töötada enne, kui arendaja on need värskendanud."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Kohalik terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Luba kohalikku turvalist juurdepääsu pakkuv terminalirakendus"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Valige vidin"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Valige vidin"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Kas luua vidin ja lubada juurdepääs?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Teenused"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Süsteem"</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_screen_magnification_summary" msgid="2380627654189671754">"Kui see funktsioon on sisse lülitatud, saate suurendada ja vähendada, kolmikpuudutades ekraani.\n\nSuurendatult saab teha järgmist.\n"<ul><li>"Paanida: lohistage kahe või enama sõrmega üle ekraani."</li>\n<li>"Korrigeerida suumitaset: liigutage kahte või enamat sõrme kokku või lahku."</li></ul>\n\n"Saate ka ajutiselt suurendada sõrme all olevat kujutist, kolmikpuudutades ekraani ja hoides sõrme ekraanil. Selles suurendatud olekus saate sõrme ekraanil lohistada, et vaadata kuva erinevaid osi. Eelmisesse olekusse naasmiseks tõstke sõrm ekraanilt.\n\nMärkus: kolmikpuudutamine suurendamiseks toimib kõikjal, v.a klaviatuur ja navigeerimisriba."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Hõlbustuse otsetee"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Sees"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Välja"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kui see funktsioon sisse lülitatud, saate kiiresti lubada juurdepääsetavuse funktsiooni kahe sammuga:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Kui see funktsioon sisse lülitatud, saate kiiresti lubada juurdepääsetavuse funktsiooni kahe sammuga:\n\n1. samm: vajutage ja hoidke all toitenuppu, kuni kuulete heli või tunnete vibratsiooni.\n\n2. samm: puudutage ja hoidke kahe sõrmega, kuni kuulete helikinnitust.\n\nKui seadmel on mitu kasutajat, kasutage lukustusekraanil seda otseteed, et ajutiselt lubada juurdepääs seadme avamiseni."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Suur tekst"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ekraanisuurendus"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekraanisuurenduse värskendus"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack esitab tagasiside suulise kõnena, mis aitab pimedaid ja vaegnägijaid. Kas soovite selle Android Marketist tasuta installida?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Kirjeldust ei ole sisestatud."</string>
     <string name="settings_button" msgid="3006713718908152930">"Seaded"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Printimine"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Prindiseaded"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Teenused"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Kas soovite kasutada teenust <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> saab teie prinditavaid dokumente vastu võtta. Sellised dokumendid võivad sisaldada tundlikku teavet."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Ühtki teenust pole installitud"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Seaded"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Printerite lisamine"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Sees"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Väljas"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Aku"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Mis on akut kasutanud"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Aku andmed pole saadaval."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"WiFi töötab"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tahvelarvuti"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Saadetud andmed"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Vastuvõetud andmed"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Saadetud mobiilsideandmed"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Vastuvõetud mobiilsideandmed"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Saadetud WiFi-andmed"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Vastuvõetud WiFi-andmed"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Heli"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Kestus"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Helikõrgus"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Mõjutab räägitava teksti tooni"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Keel"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Keelt pole valitud"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Määrab räägitud teksti keelespetsiifilise hääle"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Kuulake näidet"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Esita lühike kõnesünteesi demo"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP-d ei toetata."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Seadistamise ajal ei saa seadistada EAP WiFi-ühendust. Saate seda teha pärast seadistamise lõppu. Selleks tehke valikud Seaded &gt; Traadita ühendus ja võrgud."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Ühendamiseks võib kuluda mõni minut ..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Seadistamise jätkamiseks puudutage nuppu "<b>"Edasi"</b>"."\n\n"Teise WiFi-võrguga ühenduse loomiseks puudutage valikut "<b>"Tagasi"</b>"."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Seadistamise jätkamiseks puudutage nuppu "<b>"Edasi"</b>".\n\nTeise WiFi-võrguga ühenduse loomiseks puudutage valikut "<b>"Tagasi"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sünkroonimine lubatud"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sünkroonimine keelatud"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Sünkroonimise viga"</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalender"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kontaktid"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Tere tulemast Google Synci!"</font>" "\n"See on Google\'i meetod andmete sünkroonimiseks, mis tagab teile kõikjal juurdepääsu kontaktisikutele, kokkusaamistele ja muule."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Tere tulemast Google Synci!"</font>" \nSee on Google\'i meetod andmete sünkroonimiseks, mis tagab teile kõikjal juurdepääsu kontaktisikutele, kokkusaamistele ja muule."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Rakenduse sünkroonimisseaded"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Andmed ja sünkroonimine"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Parooli muutmine"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Silu GPU ülejoonistust"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Keela HW ülekatted"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Kasuta alati GPU-d kuva koostamisel"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Luba OpenGL-i jälgimine"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Keelab mobiilsidevõrkude taustaandmed. Võimalusel kasutatakse muid võrke."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Rakend. taustandm. piiramiseks määrake mob. andmeside piirang."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Kas soovite taustandmeid piirata?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Funktsiooni tõttu võivad taustaandmetel põhinev rakendus töötamast lakata, kui saadaval on ainult mobiilsidevõrgud."\n\n"Andmekasutuse täpsemad juhtelemendid leiate rakenduse seadetest."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Funktsiooni tõttu võivad taustaandmetel põhinev rakendus töötamast lakata, kui saadaval on ainult mobiilsidevõrgud.\n\nAndmekasutuse täpsemad juhtelemendid leiate rakenduse seadetest."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Taustandmete piiramine on võimalik vaid juhul, kui olete määranud mobiilse andmeside piirangu."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Kas lülitan andmete automaatse sünkroonimise sisse?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Veebis kontodel tehtud muudatused kopeeritakse automaatselt teie tahvelarvutisse."\n\n"Mõned kontod võivad ka kõik tahvelarvutis tehtud muudatused automaatselt veebi kopeerida. Google\'i konto töötab nii."\n\n"Igal kontol sünkroonitava teabe valimiseks avage jaotis Seaded &gt; Kontod."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Veebis kontodel tehtud muudatused kopeeritakse automaatselt teie telefoni."\n\n"Mõned kontod võivad ka kõik telefonis tehtud muudatused automaatselt veebi kopeerida. Google\'i konto töötab nii."\n\n"Igal kontol sünkroonitava teabe valimiseks avage jaotis Seaded &gt; Kontod."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Veebis kontodel tehtud muudatused kopeeritakse automaatselt teie tahvelarvutisse.\n\nMõned kontod võivad ka kõik tahvelarvutis tehtud muudatused automaatselt veebi kopeerida. Google\'i konto töötab nii.\n\nIgal kontol sünkroonitava teabe valimiseks avage jaotis Seaded &gt; Kontod."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Veebis kontodel tehtud muudatused kopeeritakse automaatselt teie telefoni.\n\nMõned kontod võivad ka kõik telefonis tehtud muudatused automaatselt veebi kopeerida. Google\'i konto töötab nii.\n\nIgal kontol sünkroonitava teabe valimiseks avage jaotis Seaded &gt; Kontod."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Kas lülitan andmete automaatse sünkroonimise välja?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"See säästab andmemahu ja aku kasutust, kuid teil tuleb hiljutise teabe hankimiseks sünkroonida iga konto eraldi ja värskenduste ilmumisel ei kuvata teatist."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Kasutustsükli lähtestuskuupäev"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Andmekasutuse hoiatuse määramine"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Andmekasutuse piirangu määramine"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Andmekasutuse piiramine"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Määratud limiidi saavutamisel keelatakse mobiilne andmesideühendus."\n\n"Kaaluge konservatiivse limiidi kasutamist, kuna andmekasutust mõõdab teie tahvelarvuti ja teenusepakkuja võib arvestada kasutust teisiti."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Määratud limiidi saavutamisel keelatakse mobiilne  andmesideühendus."\n\n"Kaaluge konservatiivse limiidi kasutamist, kuna andmekasutust mõõdab teie telefon ja teenusepakkuja võib arvestada kasutust teisiti."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Määratud limiidi saavutamisel keelatakse mobiilne andmesideühendus.\n\nKaaluge konservatiivse limiidi kasutamist, kuna andmekasutust mõõdab teie tahvelarvuti ja teenusepakkuja võib arvestada kasutust teisiti."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Määratud limiidi saavutamisel keelatakse mobiilne  andmesideühendus.\n\nKaaluge konservatiivse limiidi kasutamist, kuna andmekasutust mõõdab teie telefon ja teenusepakkuja võib arvestada kasutust teisiti."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Kas soovite taustandmeid piirata?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Kui piirate mobiilside taustandmeid, siis WiFi-võrgu puudumisel mõned rakendused ja teenused ei tööta."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Kui piirate mobiilside taustandmeid, siis teatud rakendused ja teenused ei tööta, välja arvatud juhul, kui olete ühenduses WiFi-võrguga."\n\n"Seade mõjutab kõiki tahvelarvuti kasutajaid."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Kui piirate mobiilside taustandmeid, siis teatud rakendused ja teenused ei tööta, välja arvatud juhul, kui olete ühenduses WiFi-võrguga."\n\n"Seade mõjutab kõiki telefoni kasutajaid."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Kui piirate mobiilside taustandmeid, siis teatud rakendused ja teenused ei tööta, välja arvatud juhul, kui olete ühenduses WiFi-võrguga.\n\nSeade mõjutab kõiki tahvelarvuti kasutajaid."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Kui piirate mobiilside taustandmeid, siis teatud rakendused ja teenused ei tööta, välja arvatud juhul, kui olete ühenduses WiFi-võrguga.\n\nSeade mõjutab kõiki telefoni kasutajaid."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"hoiatus"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"piir"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Eemaldatud rakendused"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Kasutaja"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Piiratud profiil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Uue kasutaja lisamine"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Võite jagada seadet teiste kasutajatega, luues uusi kasutajaid. Igal kasutajal on oma ruum, mida saab kohandada rakenduste, taustapildi ja muuga. Kasutajad saavad kohandada ka tahvelarvuti seadeid, näiteks WiFi-valikuid, mis mõjutavad kõiki kasutajaid."\n\n"Pärast uue kasutaja loomist peab kasutaja läbima seadistusprotsessi."\n\n"Iga kasutaja saab teiste kasutajate nimel võtta vastu värskendatud rakenduse lubasid."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"Pärast uue kasutaja loomist peab kasutaja läbima seadistusprotsessi."\n\n"Iga kasutaja saab teiste kasutajate nimel võtta vastu värskendatud rakenduste lubasid."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Võite jagada seadet teiste kasutajatega, luues uusi kasutajaid. Igal kasutajal on oma ruum, mida saab kohandada rakenduste, taustapildi ja muuga. Kasutajad saavad kohandada ka tahvelarvuti seadeid, näiteks WiFi-valikuid, mis mõjutavad kõiki kasutajaid.\n\nPärast uue kasutaja loomist peab kasutaja läbima seadistusprotsessi.\n\nIga kasutaja saab teiste kasutajate nimel võtta vastu värskendatud rakenduse lubasid."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Pärast uue kasutaja loomist peab kasutaja läbima seadistusprotsessi.\n\nIga kasutaja saab teiste kasutajate nimel võtta vastu värskendatud rakenduste lubasid."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Kas seadistada nüüd kasutaja?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Veenduge, et isik saab tahvelarvutit kasutada ja oma ruumi seadistada"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Kas soovite kohe profiili seadistada?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Seade mõjutab kõiki telefoni kasutajaid."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Muuda keelt"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Fondi suuruse muutmine"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Piirangud"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Eemalda piirangud"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Muuda PIN-koodi"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Kuva teatised"</string>
     <string name="help_label" msgid="1107174367904110532">"Abi"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Sisu konto"</string>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 76de88b25f2..b9656b0da15 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -191,7 +191,7 @@
   </string-array>
   <string-array name="wifi_ip_settings">
     <item msgid="3906714200993111074">"DHCP"</item>
-    <item msgid="628395202971532382">"آمار"</item>
+    <item msgid="628395202971532382">"ثابت"</item>
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"هیچکدام"</item>
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"مکان"</item>
     <item msgid="255608127647030286">"شخصی"</item>
     <item msgid="4588829735729884491">"پیام‌رسانی"</item>
-    <item msgid="8971765125227378270">"دستگاه"</item>
+    <item msgid="886742181977884584">"رسانه"</item>
+    <item msgid="7924928667052300589">"دستگاه"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"موقعیت مکانی غیردقیق"</item>
@@ -246,7 +247,7 @@
     <item msgid="6546959730920410907">"اصلاح گزارش تماس"</item>
     <item msgid="446877710771379667">"خواندن تقویم"</item>
     <item msgid="7674458294386319722">"اصلاح تقویم"</item>
-    <item msgid="8281201165558093009">"جستجوی شبکه wi-fi"</item>
+    <item msgid="8281201165558093009">"جستجوی شبکه Wi‑Fi"</item>
     <item msgid="8694611243479480497">"اعلان"</item>
     <item msgid="7776439107987345446">"جستجوی شبکه سلولی"</item>
     <item msgid="514615766544675057">"تماس تلفنی"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"پخش صدا"</item>
     <item msgid="8374996688066472414">"خواندن کلیپ بورد"</item>
     <item msgid="3045529469061083747">"اصلاح کلیپ‌بورد"</item>
+    <item msgid="5124443975763747838">"دکمه‌های رسانه‌ای"</item>
+    <item msgid="4547883971364273343">"فوکوس صدا"</item>
+    <item msgid="2603878814882344450">"میزان کنترل"</item>
+    <item msgid="7136963238377062018">"میزان صدا"</item>
+    <item msgid="4270236897655923007">"حجم حلقه"</item>
+    <item msgid="6325739889222559394">"میزان صدای رسانه"</item>
+    <item msgid="5762123934816216821">"میزان صدای زنگ هشدار"</item>
+    <item msgid="785049718065337473">"میزان صدای اعلان"</item>
+    <item msgid="6700305533746877052">"میزان صدای بلوتوث"</item>
+    <item msgid="2029227495214047094">"بیدار باش"</item>
+    <item msgid="26109888160231211">"کنترل موقعیت مکانی"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"موقعیت مکانی"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"پخش صدا"</item>
     <item msgid="136815868796597058">"خواندن کلیپ بورد"</item>
     <item msgid="5238692940326972503">"اصلاح کردن کلیپ بورد"</item>
+    <item msgid="5753789168376302997">"دکمه‌های رسانه‌"</item>
+    <item msgid="3265262911688671938">"فوکوس صدا"</item>
+    <item msgid="2098976479485046797">"میزان صدای اصلی"</item>
+    <item msgid="5660213838861789350">"میزان صدای مکالمه"</item>
+    <item msgid="7983336752371254444">"میزان صدای زنگ"</item>
+    <item msgid="7878027809189330917">"میزان صدای رسانه"</item>
+    <item msgid="7260546305036218513">"میزان صدای زنگ هشدار"</item>
+    <item msgid="9103719301075748925">"میزان صدای اعلان"</item>
+    <item msgid="7025966722295861512">"میزان صدای بلوتوث"</item>
+    <item msgid="4665183401128289653">"بیدار باش"</item>
+    <item msgid="8584357129746649222">"موقعیت مکانی"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"کوتاه"</item>
     <item msgid="2560532955514699713">"متوسط"</item>
     <item msgid="2372711992605524591">"طولانی"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"‫ART (اشکال‌زدایی)‏"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"استفاده از Dalvik"</item>
+    <item msgid="5131846588686178907">"استفاده از ART"</item>
+    <item msgid="4530003713865319928">"استفاده از نسخه اشکال‌زدایی ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"هرگز بررسی نشود"</item>
     <item msgid="6042769699089883931">"فقط بررسی محتوای DRM"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"بر روی صفحه نمایش بصورت خط"</item>
     <item msgid="120512413928262547">"در adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"غیرفعال"</item>
+    <item msgid="7688197031296835369">"نمایش نواحی بازنویسی"</item>
+    <item msgid="8332661909019981149">"نمایش شمارشگر میزان بازنویسی"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"حد استاندارد"</item>
     <item msgid="4071574792028999443">"بدون پردازش در پس‌زمینه"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 163e562ca80..9ffbc1500f1 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -275,8 +275,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_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>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"هر بار که رایانهٔ لوحی خود را روشن می‌کنید، برای رمزگشایی به یک پین عددی یا رمز ورود نیاز دارید"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"هر بار که تلفن خود را روشن می‌کنید، برای رمزگشایی به یک پین عددی یا رمز ورود نیاز دارید"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"رمز گذاری شده"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"شما می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده و داده‌های آن‌ها، رسانه و فایل‌های دیگر خود را رمزگذاری کنید. هنگامی که رایانهٔ لوحی خود را رمزگذاری کردید، هر بار که آن را روشن می‌کنید باید یک پین عددی یا یک گذرواژه را وارد کنید تا رمزگشایی شود. به هیچ وجه نمی‌توانید رمزگذاری رایانهٔ لوحی خود را لغو کنید مگر اینکه به تنظیمات کارخانه بازنشانی کنید که این کار هم تمام داده‌های شما را حذف می‌کند."\n\n"عملیات رمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری دارای شارژ کامل باشد و رایانهٔ لوحی باید تا پایان کار رمزگذاری به برق وصل باشد. اگر در روند رمزگذاری تداخلی به وجود بیاورید، تمام یا بعضی از داده‌های خود را از دست خواهید داد."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"شما می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده و داده‌های آن‌ها، رسانه و فایل‌های دیگر خود را رمزگذاری کنید. هنگامی که گوشی خود را رمزگذاری کردید، هر بار که آن را روشن می‌کنید باید یک پین عددی یا یک گذرواژه را وارد کنید تا رمزگشایی شود. به هیچ وجه نمی‌توانید رمزگذاری گوشی خود را لغو کنید مگر اینکه به تنظیمات کارخانه بازنشانی کنید که این کار هم تمام داده‌های شما را حذف می‌کند."\n\n"عملیات رمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری دارای شارژ کامل باشد و گوشی باید تا پایان کار رمزگذاری به برق وصل باشد. اگر در روند رمزگذاری تداخلی به وجود بیاورید، تمام یا بعضی از داده‌های خود را از دست خواهید داد."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"شما می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده و داده‌های آن‌ها، رسانه و فایل‌های دیگر خود را رمزگذاری کنید. هنگامی که رایانهٔ لوحی خود را رمزگذاری کردید، هر بار که آن را روشن می‌کنید باید یک پین عددی یا یک گذرواژه را وارد کنید تا رمزگشایی شود. به هیچ وجه نمی‌توانید رمزگذاری رایانهٔ لوحی خود را لغو کنید مگر اینکه به تنظیمات کارخانه بازنشانی کنید که این کار هم تمام داده‌های شما را حذف می‌کند.\n\nعملیات رمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری دارای شارژ کامل باشد و رایانهٔ لوحی باید تا پایان کار رمزگذاری به برق وصل باشد. اگر در روند رمزگذاری تداخلی به وجود بیاورید، تمام یا بعضی از داده‌های خود را از دست خواهید داد."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"شما می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده و داده‌های آن‌ها، رسانه و فایل‌های دیگر خود را رمزگذاری کنید. هنگامی که گوشی خود را رمزگذاری کردید، هر بار که آن را روشن می‌کنید باید یک پین عددی یا یک گذرواژه را وارد کنید تا رمزگشایی شود. به هیچ وجه نمی‌توانید رمزگذاری گوشی خود را لغو کنید مگر اینکه به تنظیمات کارخانه بازنشانی کنید که این کار هم تمام داده‌های شما را حذف می‌کند.\n\nعملیات رمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری دارای شارژ کامل باشد و گوشی باید تا پایان کار رمزگذاری به برق وصل باشد. اگر در روند رمزگذاری تداخلی به وجود بیاورید، تمام یا بعضی از داده‌های خود را از دست خواهید داد."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"رمزگذاری رایانهٔ لوحی شخصی"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"رمزگذاری گوشی"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"باتری خود را شارژ کرده و دوباره امتحان کنید."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"پس از <xliff:g id="DELAY">^1</xliff:g> ثانیه دوباره امتحان کنید."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"گذرواژهٔ خود را تایپ کنید"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"رمزگذاری ناموفق"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"رمزگذاری متوقف شد و امکان تکمیل کردن آن وجود ندارد. در نتیجه، داده‌های موجود در رایانهٔ لوحی شما دیگر قابل دسترسی نیستند. "\n\n"برای ادامه استفاده از رایانهٔ لوحی خود، باید تنظیمات کارخانه را بازنشانی کنید. با تنظیم کردن رایانهٔ لوحی پس از بازنشانی، این فرصت را خواهید داشت تا هرگونه داده‌ای را که از آن در حساب Google نسخهٔ پشتیبان تهیه شده بازیابی کنید."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"رمزگذاری متوقف شد و امکان تکمیل آن وجود ندارد. در نتیجه، داده‌های موجود در تلفن شما دیگر قابل دسترسی نیستند. "\n\n"برای ادامه استفاده از تلفن خود، باید تنظیمات کارخانه را بازنشانی کنید. با راه‌اندازی تلفن پس از بازنشانی، این فرصت را خواهید داشت تا هرگونه داده‌ای را که از آن در حساب Google نسخهٔ پشتیبان تهیه شده بازیابی کنید."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"رمزگذاری متوقف شد و امکان تکمیل کردن آن وجود ندارد. در نتیجه، داده‌های موجود در رایانهٔ لوحی شما دیگر قابل دسترسی نیستند. \n\nبرای ادامه استفاده از رایانهٔ لوحی خود، باید تنظیمات کارخانه را بازنشانی کنید. با تنظیم کردن رایانهٔ لوحی پس از بازنشانی، این فرصت را خواهید داشت تا هرگونه داده‌ای را که از آن در حساب Google نسخهٔ پشتیبان تهیه شده بازیابی کنید."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"رمزگذاری متوقف شد و امکان تکمیل آن وجود ندارد. در نتیجه، داده‌های موجود در تلفن شما دیگر قابل دسترسی نیستند. \n\nبرای ادامه استفاده از تلفن خود، باید تنظیمات کارخانه را بازنشانی کنید. با راه‌اندازی تلفن پس از بازنشانی، این فرصت را خواهید داشت تا هرگونه داده‌ای را که از آن در حساب Google نسخهٔ پشتیبان تهیه شده بازیابی کنید."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"تغییر روش ورودی"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"قفل صفحهٔ نمایش را انتخاب کنید"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"قفل پشتیبان را انتخاب کنید"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"در حال اتصال"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"متصل"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"در دسترس"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"درحال استفاده"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"تنظیمات نمایش"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"اتصال قطع شود؟"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"این کار اتصال شما را با این دستگاه قطع می‌کند:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,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="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"ایمن شده با <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"، ایمن شده با <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"هیچکدام"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"برای بهبود دقت موقعیت مکانی و مقاصد دیگر، <xliff:g id="APP_NAME">%1$s</xliff:g> می‌خواهد اسکن کردن شبکه را فعال کند، حتی هنگامی که Wi-Fi خاموش است."\n\n"این مورد را برای همه برنامه‌هایی که می‌خواهند اسکن کنند مجاز می‌کنید؟"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"برای بهبود دقت موقعیت مکانی و مقاصد دیگر، <xliff:g id="APP_NAME">%1$s</xliff:g> می‌خواهد اسکن کردن شبکه را فعال کند، حتی هنگامی که Wi-Fi خاموش است.\n\nاین مورد را برای همه برنامه‌هایی که می‌خواهند اسکن کنند مجاز می‌کنید؟"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"مجاز"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"رد کردن"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"اتصال"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"اخطار: ممکن است هزینه‌ حامل مخابراتی اضافی از شما دریافت شود.\n\nراه‌اندازی رایانه لوحی ممکن است به فعالیت شبکه قابل‌ توجهی نیاز داشته باشد."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"اخطار: ممکن است هزینه‌ حامل مخابراتی اضافی از شما دریافت شود.\n\nراه‌اندازی تلفن ممکن است به فعالیت شبکه قابل‌ توجهی نیاز داشته باشد."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"هشدار: تا زمانی که به اینترنت متصل نشوید، رایانه لوحی نمی‌تواند تشخیص دهد که نرم‌افزار شما به‌روز است."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"هشدار: تا زمانی که به اینترنت متصل نشوید، تلفن نمی‌تواند تشخیص دهد که نرم‌افزار شما به‌روز است."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"رایانه لوحی قادر به اتصال به این شبکه Wi-Fi نیست."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"پین سیم کارت"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"پین اشتباه"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"پین‌ها با یکدیگر مطابقت ندارند"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"نمی‌توانید پین را تغییر دهید."\n"ممکن است پین اشتباه باشد."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"نمی‌توانید پین را تغییر دهید.\nممکن است پین اشتباه باشد."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"پین سیم کارت با موفقیت تغییر کرد"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"نمی‌توان وضعیت قفل سیم کارت را تغییر داد."\n"احتمالاً پین نادرست است."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"نمی‌توان وضعیت قفل سیم کارت را تغییر داد.\nاحتمالاً پین نادرست است."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"تأیید"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"لغو"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"وضعیت رایانهٔ لوحی"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"بازنشانی به داده‌های کارخانه"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"پاک کردن تمام داده‌های موجود در رایانهٔ لوحی"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"پاک کردن تمام داده‌های موجود در گوشی"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"با این کار همه داده‌های "<b>"حافظهٔ داخلی"</b>" رایانهٔ لوحی شما پاک می‌شود، از جمله:"\n\n<li>"حساب Google شما"<li>\n</li>"داده‌ها و تنظیمات برنامه و سیستم"<li>\n</li>"برنامه‌های دانلود شده"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"با این کار همه داده‌های "<b>"حافظهٔ داخلی"</b>" گوشی شما پاک می‌شود، از جمله:"\n\n<li>"حساب Google شما"</li>\n<li>"داده‌های برنامه و سیستم و تنظیمات"</li>\n<li>"برنامه‌های دانلود شده"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"شما در حال حاضر به حساب‌های زیر وارد شده‌اید:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"با این کار همه داده‌های "<b>"حافظهٔ داخلی"</b>" رایانهٔ لوحی شما پاک می‌شود، از جمله:\n\n"<li>"حساب Google شما"<li>\n</li>"داده‌ها و تنظیمات برنامه و سیستم"<li>\n</li>"برنامه‌های دانلود شده"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"با این کار همه داده‌های "<b>"حافظهٔ داخلی"</b>" گوشی شما پاک می‌شود، از جمله:\n\n"<li>"حساب Google شما"</li>\n<li>"داده‌های برنامه و سیستم و تنظیمات"</li>\n<li>"برنامه‌های دانلود شده"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"شما در حال حاضر به حساب‌های زیر وارد شده‌اید:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"موسیقی"</li>\n<li>"عکس ها"</li>\n<li>"سایر اطلاعات کاربر"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"برای پاک کردن موسیقی، عکس‌ها و سایر داده‌های کاربر، "<b>"حافظهٔ USB"</b>" باید پاک شود."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"برای پاک کردن موسیقی، عکس‌ها و سایر داده‌های کاربر، "<b>"کارت SD"</b>" باید پاک شود."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"فرآیندهای ذخیره شده در حافظهٔ پنهان"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"بازنشانی تنظیمات برگزیده برنامه"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"تنظیمات برگزیده برنامه بازنشانی شوند؟"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"این کار همه تنظیمات برگزیده این موارد را بازنشانی می‌کند:"\n\n" "<li>"برنامه‌های غیرفعال شده"</li>\n" "<li>"اعلان‌های برنامه غیرفعال شده"</li>\n" "<li>"برنامه‌های پیش‌فرض برای عملیات"</li>\n" "<li>"محدودیت‌های داده پس‌زمینه برای برنامه‌ها"</li>\n\n" داده برنامه را از دست نمی‌دهید."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"این کار همه تنظیمات برگزیده این موارد را بازنشانی می‌کند:\n\n "<li>"برنامه‌های غیرفعال شده"</li>\n" "<li>"اعلان‌های برنامه غیرفعال شده"</li>\n" "<li>"برنامه‌های پیش‌فرض برای عملیات"</li>\n" "<li>"محدودیت‌های داده پس‌زمینه برای برنامه‌ها"</li>\n\n" داده برنامه را از دست نمی‌دهید."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"بازنشانی برنامه‌ها"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"مدیریت فضا"</string>
     <string name="filter" msgid="2018011724373033887">"فیلتر"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"برای تغییر، Control-کلید فاصله را فشار هید"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"پیش‌فرض"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"طرح‌بندی‌های صفحه‌کلید"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"فرهنگ لغت کاربر"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"فرهنگ لغت شخصی"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"فرهنگ‌های لغت شخصی"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"فرهنگ لغت شخصی"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"افزودن"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"افزودن به فرهنگ لغت"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"گزینه‌ای در منوی نیرو برای گرفتن گزارش اشکال اضافه شود"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"بیدار ماندن"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"صفحه هرگز در حین شارژ شدن به حالت خواب نمی‌رود"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"فعال کردن گزارش تجسس Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ذخیره تمامی بسته‌های HCI بلوتوث در یک فایل"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"انتخاب زمان اجرا"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"انتخاب زمان اجرا"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"برای تغییر زمان اجرا از <xliff:g id="OLD">%1$s</xliff:g> به <xliff:g id="NEW">%2$s</xliff:g> دوباره راه‌اندازی شود؟"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"مکان‌های کاذب مجاز هستند"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"مکان‌های کاذب مجاز هستند"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"رفع عیب USB انجام شود؟"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"حفاظت از حافظهٔ USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"برنامه باید برای خواندن حافظهٔ USB اجازه بگیرد"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"حافظهٔ USB حفاظت شود؟"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"وقتی حافظهٔ USB محافظت شده است٬ برنامه‌ها باید اجازه بگیرند تا داده‌های حافظه خارجی را بخوانند."\n\n"برخی از برنامه‌ها ممکن است تا توسط برنامه‌نویسان خود به‌روزرسانی نشوند کار نکنند."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"وقتی حافظهٔ USB محافظت شده است٬ برنامه‌ها باید اجازه بگیرند تا داده‌های حافظه خارجی را بخوانند.\n\nبرخی از برنامه‌ها ممکن است تا توسط برنامه‌نویسان خود به‌روزرسانی نشوند کار نکنند."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"حفاظت از کارت SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"برنامه باید برای خواندن کارت SD اجازه بگیرد"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"کارت SD حفاظت شود؟"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"وقتی کارت SD محافظت شده است٬ برنامه‌ها باید اجازه بگیرند تا داده‌های حافظه خارجی را بخوانند."\n\n"برخی از برنامه‌ها ممکن است تا توسط برنامه‌نویسان خود به‌روزرسانی نشوند کار نکنند."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"وقتی کارت SD محافظت شده است٬ برنامه‌ها باید اجازه بگیرند تا داده‌های حافظه خارجی را بخوانند.\n\nبرخی از برنامه‌ها ممکن است تا توسط برنامه‌نویسان خود به‌روزرسانی نشوند کار نکنند."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"ترمینال محلی"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"فعال کردن ترمینال برنامه‌ کاربردی که دسترسی به برنامه محلی را پیشنهاد می‌کند"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"انتخاب اسبابک"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"انتخاب ابزارک"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"آیا مایل به ایجاد ابزارک و دادن اجازهٔ دسترسی هستید؟"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"سرویس‌ها"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"سیستم"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"حرکات بزرگنمایی"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"وقتی این ویژگی فعال است، شما می‌توانید با سه ضربه روی صفحه بزرگنمایی یا کوچکنمایی کنید."\n\n"هنگام بزرگنمایی می‌توانید:"\n<ul><li>"حرکت کنید: دو یا چند انگشت خود را روی صفحه بکشید."</li>\n<li>"تنظیم سطح بزرگنمایی: دو یا چند انگشت خود را به هم نزدیک کنید یا از هم دور کنید."</li></ul>\n\n"همچنین می‌توانید به صورت موقت آنچه را که در زیر انگشتان شما قرار دارد با سه بار ضربه روی صفحه و نگهداشتن آن بزرگ کنید. در این حالت بزرگنمایی شده، می‌توانید انگشت خود را برای کاوش قسمت‌های مختلف صفحه بکشید. برای بازگشت به حالت قبلی خود، انگشت خود را بردارید."\n\n"توجه: سه بار ضربه برای بزرگنمایی همه جا به غیر از صفحه کلید و نوار پیمایش کار می‌کند."</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_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>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Talkback یک بازخورد شفاهی برای کمک به کاربران نابینا و کم‌بینا ارائه می‌دهد. آیا می‌خواهید آن را به صورت رایگان از Android Market نصب کنید؟"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"توضیحی ارائه نشده است."</string>
     <string name="settings_button" msgid="3006713718908152930">"تنظیمات"</string>
+    <string name="print_settings" msgid="4742428530112487843">"چاپ کردن"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"تنظیمات چاپ"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"خدمات"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"از <xliff:g id="SERVICE">%1$s</xliff:g> استفاده شود؟"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> می‌تواند اسنادی را که چاپ می‌کنید دریافت کند. این اسناد ممکن است حاوی اطلاعات مهمی باشند."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"سرویسی نصب نشده است"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"تنظیمات"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"افزودن چاپگرها"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"روشن"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"خاموش"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"باتری"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"چه چیزی باتری را مصرف کرده است"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"اطلاعات مصرف باتری موجود نیست."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi در حال اجرا"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"رایانهٔ لوحی"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"تلفن"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"داده ارسال شده"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"داده دریافت شده"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"داده‌های ارسالی تلفن همراه"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"داده‌های دریافتی تلفن همراه"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"‫داده‌های ارسالی Wi-Fi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"‫داده‌های دریافتی Wi-Fi"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"صوتی"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"ویدئو"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"زمان روشن"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"زیر و بمی صدا"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"بر صدای متن گفته شده تأثیر می‌گذارد"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"زبان"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"زبان انتخاب نشده است"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"صدای خاص یک زبان را برای متن گفتاری تنظیم می‌کند"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"به نمونه‌ای گوش کنید"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"نمایش کوتاهی از صدای ترکیبی پخش شود"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP پشتیبانی نمی‌شود."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"در حین مراحل تنظیم نمی‌توانید یک اتصال EAP Wi-Fi پیکربندی کنید. پس از تنظیم، این کار را می‌توانید از طریق تنظیمات &gt; بی‌سیم و شبکه‌ها انجام دهید."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"اتصال چند دقیقه طول می‌کشد..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"برای ادامه تنظیم "<b>"بعدی"</b>" را لمس نمایید."\n\n"برای اتصال به یک شبکه Wi-Fi دیگر "<b>"بازگشت"</b>" را لمس کنید."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"برای ادامه تنظیم "<b>"بعدی"</b>" را لمس نمایید.\n\nبرای اتصال به یک شبکه Wi-Fi دیگر "<b>"بازگشت"</b>" را لمس کنید."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"همگام‌سازی فعال شد"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"همگام‌سازی غیر فعال شد"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"خطای همگام‌سازی."</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"اشکال‌زدایی بازنویسی GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"غیر فعال کردن پوشش HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"همیشه از GPU در ترکیب صفحه استفاده شود"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"فعال کردن ردیابی‌های OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"داده‌های پس‌زمینه را در شبکه‌های تلفن همراه غیرفعال کنید. در صورت وجود از شبکه‌های غیرتلفن‌ همراه استفاده می‌شود."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"برای محدود کردن داده‌های پس‌زمینه برای این برنامه، ابتدا یک محدودیت داده تلفن همراه را تنظیم کنید."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"محدود کردن داده‌های پس‌زمینه؟"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"این ویژگی سبب می‌شود زمانی که فقط شبکه‌های تلفن همراه در دسترس هستند، عملکرد برنامه‌ای که به داده پس‌زمینه وابسته است متوقف شود. "\n\n"در تنظیمات موجود در برنامه می‌توانید کنترل‌های مناسب‌تری را برای استفاده داده به‌دست بیاورید."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"این ویژگی سبب می‌شود زمانی که فقط شبکه‌های تلفن همراه در دسترس هستند، عملکرد برنامه‌ای که به داده پس‌زمینه وابسته است متوقف شود. \n\nدر تنظیمات موجود در برنامه می‌توانید کنترل‌های مناسب‌تری را برای استفاده داده به‌دست بیاورید."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"محدود کردن داده‌های پس‌زمینه تنها زمانی امکان‌پذیر است یک محدوده‌ای برای داده‌های تلفن همراه تنظیم کنید."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"همگام‌سازی خودکار داده فعال شود؟"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"هرگونه تغییراتی که در حساب‌های خود در وب انجام می‌دهید به طور خودکار در رایانهٔ لوحی شما کپی می‌شود."\n\n"بعضی از حساب‌ها نیز ممکن است به طور خودکار تغییراتی را که در رایانهٔ لوحی خود انجام می‌دهید در وب کپی کنند. حساب Google به این صورت کار می‌کند."\n\n"برای انتخاب اینکه کدام نوع اطلاعات با هر یک از حساب‌ها همگام‌سازی شود، به تنظیمات &gt; حساب‌ها بروید."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"هرگونه تغییراتی که در حساب‌های خود در وب انجام می‌دهید به طور خودکار در تلفن شما کپی می‌شود."\n\n"بعضی از حساب‌ها نیز ممکن است به طور خودکار تغییراتی را که در تلفن همراه خود انجام می‌دهید در وب کپی کنند. حساب Google به این صورت کار می‌کند."\n\n"برای انتخاب اینکه کدام نوع اطلاعات با هر یک از حساب‌ها همگام‌سازی شود، به تنظیمات &gt; حساب‌ها بروید."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"هرگونه تغییراتی که در حساب‌های خود در وب انجام می‌دهید به طور خودکار در رایانهٔ لوحی شما کپی می‌شود.\n\nبعضی از حساب‌ها نیز ممکن است به طور خودکار تغییراتی را که در رایانهٔ لوحی خود انجام می‌دهید در وب کپی کنند. حساب Google به این صورت کار می‌کند.\n\nبرای انتخاب اینکه کدام نوع اطلاعات با هر یک از حساب‌ها همگام‌سازی شود، به تنظیمات &gt; حساب‌ها بروید."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"هرگونه تغییراتی که در حساب‌های خود در وب انجام می‌دهید به طور خودکار در تلفن شما کپی می‌شود.\n\nبعضی از حساب‌ها نیز ممکن است به طور خودکار تغییراتی را که در تلفن همراه خود انجام می‌دهید در وب کپی کنند. حساب Google به این صورت کار می‌کند.\n\nبرای انتخاب اینکه کدام نوع اطلاعات با هر یک از حساب‌ها همگام‌سازی شود، به تنظیمات &gt; حساب‌ها بروید."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"همگام‌سازی خودکار داده غیرفعال شود؟"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"این گزینه داده‌ها واستفاده از باتری را محافظت می‌کند، اما برای جمع‌آوری اطلاعات اخیر باید هر حسابی را به صورت دستی همگام‌سازی کنید. و هنگامی که به‌روزرسانی روی می‌دهد اعلان‌ها را دریافت نخواهید کرد."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"تاریخ تنظیم مجدد چرخهٔ استفاده"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"تنظیم هشدار میزان استفاده از داده"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"تنظیم محدوده استفاده از داده"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"محدود کردن استفاده از داده"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"زمانی که مقدار تعیین شده استفاده از داده برای شما به پایان برسد، اتصال داده‌ تلفن همراه شما غیرفعال می‌شود."\n\n"از آنجا که مقدار استفاده از داده، توسط رایانهٔ لوحی شما محاسبه شده است و شرکت مخابراتی شما ممکن است استفاده از داده را به صورت دیگری محاسبه کند، لطفاً سقف محتاطانه‌تری را در نظر بگیرید."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"زمانی که مقدار تعیین شده استفاده از داده برای شما به پایان برسد، اتصال داده‌ شما تلفن همراه شما غیرفعال می‌شود."\n\n"از آنجا که مقدار استفاده از داده، توسط گوشی شما محاسبه شده است و شرکت مخابراتی شما ممکن است استفاده از داده را به صورت دیگری محاسبه کند، لطفاً سقف محتاطانه‌تری را در نظر بگیرید."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"زمانی که مقدار تعیین شده استفاده از داده برای شما به پایان برسد، اتصال داده‌ تلفن همراه شما غیرفعال می‌شود.\n\nاز آنجا که مقدار استفاده از داده، توسط رایانهٔ لوحی شما محاسبه شده است و شرکت مخابراتی شما ممکن است استفاده از داده را به صورت دیگری محاسبه کند، لطفاً سقف محتاطانه‌تری را در نظر بگیرید."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"زمانی که مقدار تعیین شده استفاده از داده برای شما به پایان برسد، اتصال داده‌ شما تلفن همراه شما غیرفعال می‌شود.\n\nاز آنجا که مقدار استفاده از داده، توسط گوشی شما محاسبه شده است و شرکت مخابراتی شما ممکن است استفاده از داده را به صورت دیگری محاسبه کند، لطفاً سقف محتاطانه‌تری را در نظر بگیرید."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"محدود کردن داده‌های پس‌زمینه؟"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"اگر داده‌های پس‌زمینه تلفن همراه را محدود کنید، برخی از برنامه‌ها و خدمات تنها در صورتی کار می‌کنند که به یک شبکه Wi-Fi متصل شوید."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"در صورت محدود کردن داده‌های پس‌زمینه تلفن همراه، برخی از برنامه‌ها و خدمات تنها در صورتی کار می‌کنند که به یک شبکه Wi-Fi متصل شوید."\n\n" این تنظیم درمورد همه کاربران موجود در این رایانه لوحی اعمال می‌شود."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"اگر داده‌های پس‌زمینه تلفن همراه را محدود کنید، برخی از برنامه‌ها و خدمات تنها در صورتی کار می‌کنند که به یک شبکه Wi-Fi متصل شوید."\n\n"این تنظیم درمورد همه کاربران موجود در این تلفن اعمال می‌شود."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"در صورت محدود کردن داده‌های پس‌زمینه تلفن همراه، برخی از برنامه‌ها و خدمات تنها در صورتی کار می‌کنند که به یک شبکه Wi-Fi متصل شوید.\n\n این تنظیم درمورد همه کاربران موجود در این رایانه لوحی اعمال می‌شود."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"اگر داده‌های پس‌زمینه تلفن همراه را محدود کنید، برخی از برنامه‌ها و خدمات تنها در صورتی کار می‌کنند که به یک شبکه Wi-Fi متصل شوید.\n\nاین تنظیم درمورد همه کاربران موجود در این تلفن اعمال می‌شود."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"هشدار"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"محدودیت"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"برنامه‌های حذف شده"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"کاربر"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"نمایه محدود شده"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"اضافه کردن کاربر جدید"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"شما می‌توانید با ایجاد کاربران اضافی، این دستگاه را با سایر افراد به اشتراک بگذارید. هر کاربر فضای مخصوص به خود را دارد و می‌تواند این فضا را با برنامه‌ها، تصاویر زمینه و موارد دیگر خود سفارشی کند. کاربران همچنین می‌توانند تنظیماتی، مانند Wi-Fi، را در رایانه لوحی ایجاد کنند که بر همه کاربران تأثیر می‌گذارد."\n\n"بعد از ایجاد یک کاربر جدید، آن شخص باید مرحله تنظیم را انجام دهد."\n\n"هر کاربر می‌تواند مجوزهای برنامه به‌روز شده را از طرف سایر کاربران بپذیرد."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"بعد از ایجاد یک کاربر جدید، آن شخص باید مرحله تنظیم را انجام دهد."\n\n"هر کاربر می‌تواند مجوزهای برنامه به‌روز شده را از طرف سایر کاربران بپذیرد."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"شما می‌توانید با ایجاد کاربران اضافی، این دستگاه را با سایر افراد به اشتراک بگذارید. هر کاربر فضای مخصوص به خود را دارد و می‌تواند این فضا را با برنامه‌ها، تصاویر زمینه و موارد دیگر خود سفارشی کند. کاربران همچنین می‌توانند تنظیماتی، مانند Wi-Fi، را در رایانه لوحی ایجاد کنند که بر همه کاربران تأثیر می‌گذارد.\n\nبعد از ایجاد یک کاربر جدید، آن شخص باید مرحله تنظیم را انجام دهد.\n\nهر کاربر می‌تواند مجوزهای برنامه به‌روز شده را از طرف سایر کاربران بپذیرد."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"بعد از ایجاد یک کاربر جدید، آن شخص باید مرحله تنظیم را انجام دهد.\n\nهر کاربر می‌تواند مجوزهای برنامه به‌روز شده را از طرف سایر کاربران بپذیرد."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"هم اکنون کاربر تنظیم شود؟"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"اطمینان حاصل کنید که فرد برای گرفتن رایانه لوحی و تنظیم فضای خود، در دسترس است"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"اکنون نمایه را تنظیم می‌کنید؟"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"این تنظیم روی همه کاربران موجود در این تلفن تأثیر می‌گذارد."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"تغییر زبان"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"تغییر اندازه قلم"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"محدودیت‌ها"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"حذف محدودیت‌ها"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"تغییر پین"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"نمایش اعلان‌ها"</string>
     <string name="help_label" msgid="1107174367904110532">"راهنما"</string>
     <string name="user_account_title" msgid="1127193807312271167">"حساب برای محتوا"</string>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index a07a248edde..1511b4230bb 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Sijainti"</item>
     <item msgid="255608127647030286">"Henkilökohtaiset"</item>
     <item msgid="4588829735729884491">"Viestit"</item>
-    <item msgid="8971765125227378270">"Laite"</item>
+    <item msgid="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Laite"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"karkea sijainti"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"toista ääntä"</item>
     <item msgid="8374996688066472414">"lue leikepöytä"</item>
     <item msgid="3045529469061083747">"muokkaa leikepöytää"</item>
+    <item msgid="5124443975763747838">"mediapainikkeet"</item>
+    <item msgid="4547883971364273343">"äänen painopiste"</item>
+    <item msgid="2603878814882344450">"pää-äänenvoimakkuus"</item>
+    <item msgid="7136963238377062018">"puheäänen voimakkuus"</item>
+    <item msgid="4270236897655923007">"soittoäänen voimakkuus"</item>
+    <item msgid="6325739889222559394">"median äänenvoimakkuus"</item>
+    <item msgid="5762123934816216821">"hälytyksen äänenvoimakkuus"</item>
+    <item msgid="785049718065337473">"ilmoituksen äänenvoimakkuus"</item>
+    <item msgid="6700305533746877052">"bluetooth-äänenvoimakkuus"</item>
+    <item msgid="2029227495214047094">"ei virransäästötilaa"</item>
+    <item msgid="26109888160231211">"sijainnin seuranta"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Sijainti"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Toista ääntä"</item>
     <item msgid="136815868796597058">"Lue leikepöytä"</item>
     <item msgid="5238692940326972503">"Muokkaa leikepöytää"</item>
+    <item msgid="5753789168376302997">"Mediapainikkeet"</item>
+    <item msgid="3265262911688671938">"Äänen painopiste"</item>
+    <item msgid="2098976479485046797">"Pää-äänenvoimakkuus"</item>
+    <item msgid="5660213838861789350">"Puheäänen voimakkuus"</item>
+    <item msgid="7983336752371254444">"Soittoäänen voimakkuus"</item>
+    <item msgid="7878027809189330917">"Median äänenvoimakkuus"</item>
+    <item msgid="7260546305036218513">"Hälytyksen voimakkuus"</item>
+    <item msgid="9103719301075748925">"Ilmoituksen äänenvoimakkuus"</item>
+    <item msgid="7025966722295861512">"Bluetooth-äänenvoimakkuus"</item>
+    <item msgid="4665183401128289653">"Ei virransäästötilaa"</item>
+    <item msgid="8584357129746649222">"Sijainti"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Lyhyt"</item>
     <item msgid="2560532955514699713">"Keskipitkä"</item>
     <item msgid="2372711992605524591">"Pitkä"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (virheenkorjaus)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Käytä Dalvik-ympäristöä"</item>
+    <item msgid="5131846588686178907">"Käytä ART-ympäristöä"</item>
+    <item msgid="4530003713865319928">"Käytä ART-virheenkorjauskoontiversiota"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Älä tarkista koskaan"</item>
     <item msgid="6042769699089883931">"Tarkista vain DRM-suojattu sisältö"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Ruudulla viivoina"</item>
     <item msgid="120512413928262547">"Adb shell dumpsys gfxinfossa"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Ei käytössä"</item>
+    <item msgid="7688197031296835369">"Näytä päällekkäiset alueet"</item>
+    <item msgid="8332661909019981149">"Näytä päällekkäisyyslaskuri"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Vakioraja"</item>
     <item msgid="4071574792028999443">"Ei taustaprosesseja"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 06cf7403157..764f31670c2 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Jos sallit tiedonsiirron roaming-tilassa, sinulle voi koitua suuria roaming-maksuja.\n\nTämä asetus vaikuttaa kaikkiin tämän tablet-laitteen käyttäjiin."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Jos sallit tiedonsiirron roaming-tilassa, sinulle voi koitua suuria roaming-maksuja.\n\nTämä asetus vaikuttaa kaikkiin tämän puhelimen käyttäjiin."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Sallitaanko tiedonsiirto roaming-tilassa?"</string>
     <string name="networks" msgid="6333316876545927039">"Operaattorin valinta"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Valitse verkko-operaattori"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Vaatii PIN-koodin tai salasanan, jonka avulla tablet-laitteesi salaus puretaan aina kytkiessäsi sen virran päälle"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Vaatii PIN-koodin tai salasanan, jonka avulla puhelimesi salaus puretaan aina kytkiessäsi sen virran päälle"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Salattu"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Voit salata tilisi, asetuksesi, lataamasi sovellukset ja niiden tiedot sekä media- ja muut tiedostot. Kun tablet-laitteesi on salattu, sinun tulee antaa PIN-koodi tai salasana poistaaksesi salauksen aina kytkiessäsi laitteen virran päälle. Voit poistaa tablet-laitteesi salauksen vain palauttamalla siihen tehdasasetukset, jolloin kaikki tietosi poistetaan."\n\n"Salaus kestää vähintään tunnin. Se tulee aloittaa täydellä akulla, ja tablet-laitteen tulee olla kytkettynä laturiin koko salauksen ajan. Jos keskeytät salauksen, menetät laitteesi tietoja."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Voit salata tilisi, asetuksesi, lataamasi sovellukset ja niiden tiedot sekä media- ja muut tiedostot. Kun puhelimesi on salattu, sinun tulee antaa PIN-koodi tai salasana poistaaksesi salauksen aina kytkiessäsi laitteen virran päälle. Voit poistaa puhelimesi salauksen vain palauttamalla siihen tehdasasetukset, jolloin kaikki tietosi poistetaan."\n\n"Salaus kestää vähintään tunnin. Se tulee aloittaa täydellä akulla, ja puhelimen tulee olla kytkettynä laturiin koko salauksen ajan. Jos keskeytät salauksen, menetät laitteesi tietoja."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Voit salata tilisi, asetuksesi, lataamasi sovellukset ja niiden tiedot sekä media- ja muut tiedostot. Kun tablet-laitteesi on salattu, sinun tulee antaa PIN-koodi tai salasana poistaaksesi salauksen aina kytkiessäsi laitteen virran päälle. Voit poistaa tablet-laitteesi salauksen vain palauttamalla siihen tehdasasetukset, jolloin kaikki tietosi poistetaan.\n\nSalaus kestää vähintään tunnin. Se tulee aloittaa täydellä akulla, ja tablet-laitteen tulee olla kytkettynä laturiin koko salauksen ajan. Jos keskeytät salauksen, menetät laitteesi tietoja."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Voit salata tilisi, asetuksesi, lataamasi sovellukset ja niiden tiedot sekä media- ja muut tiedostot. Kun puhelimesi on salattu, sinun tulee antaa PIN-koodi tai salasana poistaaksesi salauksen aina kytkiessäsi laitteen virran päälle. Voit poistaa puhelimesi salauksen vain palauttamalla siihen tehdasasetukset, jolloin kaikki tietosi poistetaan.\n\nSalaus kestää vähintään tunnin. Se tulee aloittaa täydellä akulla, ja puhelimen tulee olla kytkettynä laturiin koko salauksen ajan. Jos keskeytät salauksen, menetät laitteesi tietoja."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Salaa tablet-laite"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Salaa puhelin"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Lataa akku ja yritä uudelleen."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Yritä uudelleen <xliff:g id="DELAY">^1</xliff:g> sekunnin kuluttua."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Kirjoita salasana"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Salaus epäonnistui"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Salaus keskeytyi, eikä sitä voi suorittaa loppuun. Tästä johtuen tablet-laitteesi tietoja ei voi enää käyttää. "\n\n"Voit jatkaa tablet-laitteesi käyttöä, kun palautat tehdasasetukset. Kun olet määrittänyt tablet-laitteesi asetukset tehdasasetusten palautuksen jälkeen, voit palauttaa tiedot, jotka olet varmuuskopioinut Google-tiliisi."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Salaus keskeytyi, eikä sitä voi suorittaa loppuun. Tästä johtuen puhelimesi tietoja ei voi enää käyttää. "\n\n"Voit jatkaa puhelimesi käyttöä, kun palautat tehdasasetukset. Kun olet määrittänyt puhelimesi asetukset tehdasasetusten palautuksen jälkeen, voit palauttaa tiedot, jotka olet varmuuskopioinut Google-tiliisi."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Salaus keskeytyi, eikä sitä voi suorittaa loppuun. Tästä johtuen tablet-laitteesi tietoja ei voi enää käyttää. \n\nVoit jatkaa tablet-laitteesi käyttöä, kun palautat tehdasasetukset. Kun olet määrittänyt tablet-laitteesi asetukset tehdasasetusten palautuksen jälkeen, voit palauttaa tiedot, jotka olet varmuuskopioinut Google-tiliisi."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Salaus keskeytyi, eikä sitä voi suorittaa loppuun. Tästä johtuen puhelimesi tietoja ei voi enää käyttää. \n\nVoit jatkaa puhelimesi käyttöä, kun palautat tehdasasetukset. Kun olet määrittänyt puhelimesi asetukset tehdasasetusten palautuksen jälkeen, voit palauttaa tiedot, jotka olet varmuuskopioinut Google-tiliisi."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Vaihda syöttötapaa"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Valitse ruudunlukitus"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Valitse varalukko"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Yhdistetään"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Yhdistetty"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Käytettävissä"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Käytössä"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Näyttöasetukset"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Katkaistaanko yhteys?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Katkaisee yhteyden laitteeseen:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Pois käytöstä"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Ei käytettävissä, koska NFC on poistettu käytöstä"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Kun tämä ominaisuus on käytössä, voit lähettää sovellusten sisältöä toiseen NFC-yhteensopivaan laitteeseen pitämällä laitteita lähekkäin. Voit lähettää esimerkiksi selaimen sivuja, YouTube-videoita ja yhteystietoja."\n\n"Aseta laitteet lähekkäin (yleensä taustat vastakkain) ja kosketa näyttöä. Sovellus määrittää lähetettävät tiedot."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Kun tämä ominaisuus on käytössä, voit lähettää sovellusten sisältöä toiseen NFC-yhteensopivaan laitteeseen pitämällä laitteita lähekkäin. Voit lähettää esimerkiksi selaimen sivuja, YouTube-videoita ja yhteystietoja.\n\nAseta laitteet lähekkäin (yleensä taustat vastakkain) ja kosketa näyttöä. Sovellus määrittää lähetettävät tiedot."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Verkkopalveluhaku"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Anna muiden laitteiden sovelluksien löytää tämän laitteen sovelluksia"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wifi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Salaus: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", salaus: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ei mitään"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> haluaa parantaa sijainnin tarkkuutta ja suorittaa muita toimintoja ottamalla verkon etsinnän käyttöön, vaikka wifi-yhteys ei ole käytössä."\n\n"Annetaanko tämä lupa kaikille sovelluksille, jotka haluavat etsiä verkkoja?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> haluaa parantaa sijainnin tarkkuutta ja suorittaa muita toimintoja ottamalla verkon etsinnän käyttöön, vaikka wifi-yhteys ei ole käytössä.\n\nAnnetaanko tämä lupa kaikille sovelluksille, jotka haluavat etsiä verkkoja?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Salli"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Estä"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Yhdistä"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"VAROITUS: Voit joutua maksamaan ylimääräisiä tiedonsiirtomaksuja.\n\nTablet-laitteen asetusten määrittäminen voi vaatia paljon tiedonsiirtoa."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"VAROITUS: Voit joutua maksamaan ylimääräisiä tiedonsiirtomaksuja.\n\nPuhelimen asetusten määrittäminen voi vaatia paljon tiedonsiirtoa."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"VAROITUS: Tablet-laite ei voi vahvistaa, että ohjelmisto on ajan tasalla, ennen kuin muodostat internetyhteyden."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"VAROITUS: Puhelin ei voi vahvistaa, että ohjelmisto on ajan tasalla, ennen kuin muodostat internetyhteyden."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet-laite ei voi muodostaa yhteyttä tähän wifi-verkkoon."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM-kortin PIN-koodi"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Väärä PIN-koodi"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN-koodit eivät täsmää"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"PIN-koodin vaihtaminen epäonnistui."\n"Saatoit antaa väärän PIN-koodin."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"PIN-koodin vaihtaminen epäonnistui.\nSaatoit antaa väärän PIN-koodin."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-kortin PIN-koodin vaihtaminen onnistui"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM-kortin lukitustilan muuttaminen epäonnistui."\n"PIN-koodi on mahdollisesti virheellinen."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM-kortin lukitustilan muuttaminen epäonnistui.\nPIN-koodi on mahdollisesti virheellinen."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Peruuta"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tablet-laitteen tila"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Tehdasasetuksien palauttaminen"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Poistaa kaikki tablet-laitteen tiedot"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Poistaa kaikki puhelimen tiedot"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tämä poistaa kaikki tablet-laitteesi "<b>"sisäisen tallennustilan"</b>" tiedot, kuten:"\n\n<li>"Google-tilisi"</li>\n<li>"Järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"Ladatut sovellukset"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tämä poistaa kaikki puhelimesi "<b>"sisäisen tallennustilan"</b>" tiedot, kuten:"\n\n<li>"Google-tilisi"</li>\n<li>"Järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"Ladatut sovellukset"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olet kirjautunut sisään seuraaviin tileihin:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tämä poistaa kaikki tablet-laitteesi "<b>"sisäisen tallennustilan"</b>" tiedot, kuten:\n\n"<li>"Google-tilisi"</li>\n<li>"Järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"Ladatut sovellukset"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tämä poistaa kaikki puhelimesi "<b>"sisäisen tallennustilan"</b>" tiedot, kuten:\n\n"<li>"Google-tilisi"</li>\n<li>"Järjestelmä- ja sovellustiedot ja -asetukset"</li>\n<li>"Ladatut sovellukset"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olet kirjautunut sisään seuraaviin tileihin:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiikki"</li>\n<li>"Valokuvat"</li>\n<li>"Muut käyttäjän tiedot"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Jos haluat poistaa musiikin, kuvat ja muut käyttäjän tiedot, "<b>"USB-tallennustila"</b>" tulee tyhjentää."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Jos haluat poistaa musiikin, kuvat ja muut käyttäjän tiedot, "<b>"SD-kortti"</b>" tulee tyhjentää."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Näytä välimuistiprosessit"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Nollaa sovellusasetukset"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Nollaa sovellusasetukset?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Tämä nollaa kaikki seuraavat asetukset:"\n\n" "<li>"Käytöstä poistetut sovellukset"</li>\n" "<li>"Käytöstä poistetut sovellusilmoitukset"</li>\n" "<li>"Toimintojen oletussovellukset"</li>\n" "<li>"Taustasovellusten tietojenkäyttörajoitukset"</li>\n\n" Et menetä mitään sovellusten tietoja."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Tämä nollaa kaikki seuraavat asetukset:\n\n "<li>"Käytöstä poistetut sovellukset"</li>\n" "<li>"Käytöstä poistetut sovellusilmoitukset"</li>\n" "<li>"Toimintojen oletussovellukset"</li>\n" "<li>"Taustasovellusten tietojenkäyttörajoitukset"</li>\n\n" Et menetä mitään sovellusten tietoja."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Nollaa sovellukset"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Hallinnoi tallennustilaa"</string>
     <string name="filter" msgid="2018011724373033887">"Suodata"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Vaihda painamalla Ctrl+välilyönti"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Oletus"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Näppäimistöasettelut"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Käyttäjän sanakirja"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Oma sanakirja"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Omat sanakirjat"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Oma sanakirja"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Lisää"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Lisää sanakirjaan"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Lisää virtavalikkoon virheraportin teko -valinta"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Pysy käynnissä"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Näyttö ei sammu puhelimen latautuessa"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ota Bluetoothin HCI-tarkkailuloki käyttöön"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tallenna kaikki Bluetoothin HCl-paketit tiedostoon"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Valitse suoritusympäristö"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Valitse suoritusympäristö"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Käynnistetäänkö uudelleen niin, että suoritusympäristö on <xliff:g id="OLD">%1$s</xliff:g> eikä <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Salli sijaintien imitointi"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Salli sijaintien imitointi"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Sallitaanko USB-vianetsintä?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Suojaa USB-tallennustila"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Sovellusten on pyydettävä lupa USB-tallennustilan lukemiseen"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Suojataanko USB-tallennustila?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Jos USB-tallennustila on suojattu, sovellusten on pyydettävä lupa ulkoisen tallennustilan käyttämiseen."\n\n"Jotkin sovellukset toimivat vasta, kun kehittäjät päivittävät ne."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Jos USB-tallennustila on suojattu, sovellusten on pyydettävä lupa ulkoisen tallennustilan käyttämiseen.\n\nJotkin sovellukset toimivat vasta, kun kehittäjät päivittävät ne."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Suojaa SD-kortti"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Sovellusten on pyydettävä lupa SD-kortin lukemiseen"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Suojataanko SD-kortti?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Jos SD-kortti on suojattu, sovellusten on pyydettävä lupa ulkoisen tallennustilan käyttämiseen."\n\n"Jotkin sovellukset toimivat vasta, kun kehittäjät päivittävät ne."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Jos SD-kortti on suojattu, sovellusten on pyydettävä lupa ulkoisen tallennustilan käyttämiseen.\n\nJotkin sovellukset toimivat vasta, kun kehittäjät päivittävät ne."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Paikallinen pääte"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Ota käyttöön päätesov. joka mahdollistaa paikall. liittymäkäytön"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Valitse gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Valitse widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Luo widget ja salli käyttö?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Palvelut"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Järjestelmä"</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_screen_magnification_summary" msgid="2380627654189671754">"Kun tämä ominaisuus on käytössä, voit lähentää ja loitontaa kolmoisnapauttamalla ruutua.\n\nLähennetyssä tilassa voit\n"<ul><li>"panoroida vetämällä vähintään kahta sormea ruudun poikki"</li>\n<li>"säätää lähennyksen tasoa nipistämällä vähintään kaksi sormea yhteen tai levittämällä ne erilleen."</li></ul>\n\n"Voit myös suurentaa sormesi alla olevan kohteen väliaikaisesti kolmoisnapauttamalla ja pitämällä viimeisen napautuksen ruudulla. Suurennetussa tilassa voit tutkia ruudun eri osia sormella vetämällä. Nostamalla sormen pääset takaisin edelliseen tilaan.\n\nHuomaa: suurennus kolmoisnapauttamalla toimii kaikkialla paitsi näppäimistössä ja siirtymispalkissa."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Esteettömyystilan pikakuvake"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Käytössä"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Pois käytöstä"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kun tämä ominaisuus on käytössä, voit ottaa esteettömyystoiminnot käyttöön nopeasti kahden vaiheen kautta."\n\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_global_gesture_preference_description" msgid="750438015254396963">"Kun tämä ominaisuus on käytössä, voit ottaa esteettömyystoiminnot käyttöön nopeasti kahden vaiheen kautta.\n\nVaihe 1: paina virtapainiketta, kunnes kuulet äänen tai tunnet värinän.\n\nVaihe 2: kosketa kahdella sormella, kunnes kuulet äänivahvistuksen.\n\nJos laitteella on useita käyttäjiä, tämän pikanäppäimen käyttö lukitusruudussa ottaa esteettömyystilan käyttöön väliaikaisesti, kunnes laitteen lukitus poistetaan."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Suuri teksti"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Näytön suurennus"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Päivitä näytön suurennus automaatt."</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack auttaa sokeita ja näkörajoitteisia käyttäjiä puhepalautteen avulla. Haluatko asentaa sovelluksen ilmaiseksi Android Marketista?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ei kuvausta."</string>
     <string name="settings_button" msgid="3006713718908152930">"Asetukset"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Tulostetaan"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Tulostusasetukset"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Palvelut"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Otetaanko palvelu <xliff:g id="SERVICE">%1$s</xliff:g> käyttöön?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> voi vastaanottaa tulostamiasi dokumentteja. Ne voivat sisältää arkaluonteisia tietoja."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Ei asennettuja palveluita"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Asetukset"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Lisää tulostimia"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Käytössä"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Ei käyt."</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Akku"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Mikä on käyttänyt akkua"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Akun käyttötietoja ei saatav."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wifi on käytössä"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Puhelin"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Tiedot lähetetty"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Tiedot vastaanotettu"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Lähetetty mobiilitiedonsiirto"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Vastaanotet. mobiilitiedonsiirto"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Lähetetty wifi-tiedonsiirto"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Vastaanotettu wifi-tiedonsiirto"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Ääni"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Käytössäoloaika"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Äänenkorkeus"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Vaikuttaa puhutun tekstin äänenkorkeuteen"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Kieli"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Kieltä ei ole valittu"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Asettaa puhutulle tekstille kielikohtaisen äänen"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Kuuntele esimerkki"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Toista lyhyt esittely puhesynteesistä"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP ei ole tuettu."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Et voi määrittää EAP wifi -yhteyttä asennuksen aikana. Voit määrittää yhteyden asennuksen jälkeen kohdassa Asetukset &gt; Langaton verkko ja verkot."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Yhteyden muodostaminen voi kestää muutaman minuutin..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Jatka asetuksien määrittämistä koskettamalla "<b>"Seuraava"</b>"."\n\n"Muodosta yhteys eri wifi-verkkoon koskettamalla "<b>"Takaisin"</b>"."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Jatka asetuksien määrittämistä koskettamalla "<b>"Seuraava"</b>".\n\nMuodosta yhteys eri wifi-verkkoon koskettamalla "<b>"Takaisin"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronointi käytössä"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synkronointi pois käytöstä"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Synkronointivirhe."</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalenteri"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Yhteystiedot"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Tervetuloa käyttämään Google Sync -palvelua!"</font>" "\n"Se on Googlen tapa synkronoida tietoja, ja sen avulla voit käyttää yhteystietojasi, tapaamisiasi ynnä muita tietoja mistä tahansa."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Tervetuloa käyttämään Google Sync -palvelua!"</font>" \nSe on Googlen tapa synkronoida tietoja, ja sen avulla voit käyttää yhteystietojasi, tapaamisiasi ynnä muita tietoja mistä tahansa."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Sovelluksen synkronointiasetukset"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Tiedot ja synkronointi"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Vaihda salasana"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"GPU-objektien päällekkäisyys"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Poista HW-peittok. käyt."</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Käytä GPU:ta ruudun koostamiseen"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ota OpenGL-jälj. käyttöön"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Ei taustatiedons. mobiiliverkossa. Käytä wifiä, jos mahdollista."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Aseta mobiilitiedonsiirtoraja sov. taustatiedonsiirron rajoittamiseksi"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Rajoitetaanko taustatiedonsiirtoa?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Toiminto saattaa estää taustatiedonsiirrosta riippuvaisten sovellusten toiminnan, jos käytettävissä on vain mobiiliverkkoja."\n\n"Voit säätää tiedonsiirron asetuksia tarkemmin sovelluksessa."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Toiminto saattaa estää taustatiedonsiirrosta riippuvaisten sovellusten toiminnan, jos käytettävissä on vain mobiiliverkkoja.\n\nVoit säätää tiedonsiirron asetuksia tarkemmin sovelluksessa."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Taustatiedonsiirron rajoittaminen on mahdollista vain, jos olet asettanut mobiilitiedonsiirtorajan."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Otetaanko aut. synkr. käyttöön?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Kaikki tileihisi verkossa tekemäsi muutokset kopioidaan tablet-laitteellesi automaattisesti."\n\n"Jotkut tilit voivat myös automaattisesti kopioida tablet-laitteella tehdyt muutokset verkkoon. Google-tili toimii tällä tavalla."\n\n"Valitse kunkin tilin synkronoitavat tiedot siirtymällä kohtaan Asetukset &gt; Tilit."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Kaikki tileihisi verkossa tekemäsi muutokset kopioidaan puhelimellesi automaattisesti."\n\n"Jotkut tilit voivat myös automaattisesti kopioida puhelimella tehdyt muutokset verkkoon. Google-tili toimii tällä tavalla."\n\n"Valitse kunkin tilin synkronoitavat tiedot siirtymällä kohtaan Asetukset &gt; Tilit."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Kaikki tileihisi verkossa tekemäsi muutokset kopioidaan tablet-laitteellesi automaattisesti.\n\nJotkut tilit voivat myös automaattisesti kopioida tablet-laitteella tehdyt muutokset verkkoon. Google-tili toimii tällä tavalla.\n\nValitse kunkin tilin synkronoitavat tiedot siirtymällä kohtaan Asetukset &gt; Tilit."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Kaikki tileihisi verkossa tekemäsi muutokset kopioidaan puhelimellesi automaattisesti.\n\nJotkut tilit voivat myös automaattisesti kopioida puhelimella tehdyt muutokset verkkoon. Google-tili toimii tällä tavalla.\n\nValitse kunkin tilin synkronoitavat tiedot siirtymällä kohtaan Asetukset &gt; Tilit."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Poistetaanko automaatt. synkr.?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Tämä vähentää tiedonsiirtomäärää ja akun käyttöä, mutta jokainen tili tulee synkronoida manuaalisesti, jos haluat niiden tiedot käyttöösi. Et myöskään saa ilmoituksia, jos tietoja päivitetään."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Käyttöjakson nollauspäivä"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Aseta tiedonsiirtovaroitus"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Aseta tiedonsiirtoraja"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Tiedonsiirron rajoittaminen"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobiiliyhteytesi poistetaan käytöstä, jos määritetty tiedonsiirtoraja saavutetaan."\n\n"Tablet-laite mittaa tiedonsiirron. Operaattorisi voi kuitenkin käyttää eri mittaustapaa, joten suosittelemme määrittämään rajan todellista käyttöä tiukemmaksi."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobiiliyhteytesi poistetaan käytöstä, jos määritetty tiedonsiirtoraja saavutetaan."\n\n"Puhelin mittaa tiedonsiirron. Operaattorisi voi kuitenkin käyttää eri mittaustapaa, joten suosittelemme määrittämään rajan todellista käyttöä tiukemmaksi."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobiiliyhteytesi poistetaan käytöstä, jos määritetty tiedonsiirtoraja saavutetaan.\n\nTablet-laite mittaa tiedonsiirron. Operaattorisi voi kuitenkin käyttää eri mittaustapaa, joten suosittelemme määrittämään rajan todellista käyttöä tiukemmaksi."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobiiliyhteytesi poistetaan käytöstä, jos määritetty tiedonsiirtoraja saavutetaan.\n\nPuhelin mittaa tiedonsiirron. Operaattorisi voi kuitenkin käyttää eri mittaustapaa, joten suosittelemme määrittämään rajan todellista käyttöä tiukemmaksi."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Rajoitetaanko taustatiedonsiirtoa?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Jos rajoitat taustalla tapahtuvaa mobiilitiedonsiirtoa, jotkin sovellukset ja palvelut eivät toimi, ellet ole yhteydessä wifi-verkkoon."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Jos rajoitat taustalla tapahtuvaa mobiilitiedonsiirtoa, jotkin sovellukset ja palvelut eivät toimi, ellet ole yhteydessä wifi-verkkoon."\n\n"Tämä asetus vaikuttaa kaikkiin tämän tablet-laitteen käyttäjiin."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Jos rajoitat taustalla tapahtuvaa mobiilitiedonsiirtoa, jotkin sovellukset ja palvelut eivät toimi, ellet ole yhteydessä wifi-verkkoon."\n\n"Tämä asetus vaikuttaa kaikkiin tämän puhelimen käyttäjiin."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Jos rajoitat taustalla tapahtuvaa mobiilitiedonsiirtoa, jotkin sovellukset ja palvelut eivät toimi, ellet ole yhteydessä wifi-verkkoon.\n\nTämä asetus vaikuttaa kaikkiin tämän tablet-laitteen käyttäjiin."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Jos rajoitat taustalla tapahtuvaa mobiilitiedonsiirtoa, jotkin sovellukset ja palvelut eivät toimi, ellet ole yhteydessä wifi-verkkoon.\n\nTämä asetus vaikuttaa kaikkiin tämän puhelimen käyttäjiin."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"varoitus"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"rajoitus"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Poistetut sovellukset"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Käyttäjä"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Rajoitettu profiili"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Lisää uusi käyttäjä"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Voit jakaa tämän laitteen muiden kanssa luomalla uusia käyttäjiä. Jokaisella käyttäjällä on oma tila, johon he voivat lisätä omia sovelluksiaan, taustakuvan ynnä muuta. Käyttäjät voivat myös muokata kaikkiin käyttäjiin vaikuttavia tablet-laitteen asetuksia, kuten wifi-yhteysasetuksia."\n\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_add_user_message_long" msgid="3086244205384741788">"Voit jakaa tämän laitteen muiden kanssa luomalla uusia käyttäjiä. Jokaisella käyttäjällä on oma tila, johon he voivat lisätä omia sovelluksiaan, taustakuvan ynnä muuta. Käyttäjät voivat myös muokata kaikkiin käyttäjiin vaikuttavia tablet-laitteen asetuksia, kuten wifi-yhteysasetuksia.\n\nKun luot uuden käyttäjän, hänen täytyy määrittää omat asetuksensa.\n\nKaikki käyttäjät voivat hyväksyä päivitettyjä sovelluksien lupia muiden käyttäjien puolesta."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Kun luot uuden käyttäjän, hänen täytyy määrittää omat asetuksensa.\n\nKaikki käyttäjät voivat hyväksyä päivitettyjä sovelluksien lupia muiden käyttäjien puolesta."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Määritetäänkö käyttäjän asetukset nyt?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Varmista, että tämä henkilö voi ottaa tablet-laitteen käyttöönsä, ja määritä hänen tilansa asetukset"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Määritetäänkö profiilin asetukset nyt?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Tämä asetus vaikuttaa kaikkiin tämän puhelimen käyttäjiin."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Vaihda kieltä"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Muuta kirjasinkokoa"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Rajoitukset"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Poista rajoitukset"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Vaihda PIN-koodi"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Näytä ilmoitukset"</string>
     <string name="help_label" msgid="1107174367904110532">"Ohje"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Käytettävä tili"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index b0448070d79..f8928465501 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Position"</item>
     <item msgid="255608127647030286">"Personnel"</item>
     <item msgid="4588829735729884491">"SMS/MMS"</item>
-    <item msgid="8971765125227378270">"Appareil"</item>
+    <item msgid="886742181977884584">"Multimédia"</item>
+    <item msgid="7924928667052300589">"Appareil"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"position approximative"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"lire le fichier audio"</item>
     <item msgid="8374996688066472414">"lire le Presse-papiers"</item>
     <item msgid="3045529469061083747">"modifier le Presse-papiers"</item>
+    <item msgid="5124443975763747838">"boutons pour contenus multimédias"</item>
+    <item msgid="4547883971364273343">"priorité audio"</item>
+    <item msgid="2603878814882344450">"volume général"</item>
+    <item msgid="7136963238377062018">"volume de la voix"</item>
+    <item msgid="4270236897655923007">"volume des sonneries"</item>
+    <item msgid="6325739889222559394">"volume des contenus multimédias"</item>
+    <item msgid="5762123934816216821">"volume des alarmes"</item>
+    <item msgid="785049718065337473">"volume des notifications"</item>
+    <item msgid="6700305533746877052">"volume Bluetooth"</item>
+    <item msgid="2029227495214047094">"maintenir activé"</item>
+    <item msgid="26109888160231211">"suivre la position"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Position"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Lire le fichier audio"</item>
     <item msgid="136815868796597058">"Lire le Presse-papiers"</item>
     <item msgid="5238692940326972503">"Modifier le Presse-papiers"</item>
+    <item msgid="5753789168376302997">"Boutons multimédias"</item>
+    <item msgid="3265262911688671938">"Priorité audio"</item>
+    <item msgid="2098976479485046797">"Volume général"</item>
+    <item msgid="5660213838861789350">"Volume de la voix"</item>
+    <item msgid="7983336752371254444">"Volume de la sonnerie"</item>
+    <item msgid="7878027809189330917">"Volume des contenus multimédias"</item>
+    <item msgid="7260546305036218513">"Volume de l\'alarme"</item>
+    <item msgid="9103719301075748925">"Volume des notifications"</item>
+    <item msgid="7025966722295861512">"Volume Bluetooth"</item>
+    <item msgid="4665183401128289653">"Maintenir activé"</item>
+    <item msgid="8584357129746649222">"Localisation"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Court"</item>
     <item msgid="2560532955514699713">"Moyen"</item>
     <item msgid="2372711992605524591">"Long"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (débogage)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Utiliser Dalvik"</item>
+    <item msgid="5131846588686178907">"Utiliser ART"</item>
+    <item msgid="4530003713865319928">"Utiliser le build de débogage ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Ne jamais vérifier"</item>
     <item msgid="6042769699089883931">"Vérifier le contenu GDN uniquement"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"À l\'écran sous forme de lignes"</item>
     <item msgid="120512413928262547">"Dans adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Désactivé"</item>
+    <item msgid="7688197031296835369">"Afficher les zones de conflit"</item>
+    <item msgid="8332661909019981149">"Afficher le compteur des conflits"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite standard"</item>
     <item msgid="4071574792028999443">"Aucun processus en arrière-plan"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 24e2991bc81..a3d940d17a3 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Lorsque vous autorisez l\'itinérance des données, des frais d\'itinérance importants peuvent s\'appliquer !\n\nCe paramètre affecte tous les utilisateurs de cette tablette."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Lorsque vous autorisez l\'itinérance des données, des frais d\'itinérance importants peuvent s\'appliquer !\n\nCe paramètre affecte tous les utilisateurs de ce téléphone."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Autoriser l\'itinérance des données ?"</string>
     <string name="networks" msgid="6333316876545927039">"Sélection de l\'opérateur"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Sélectionner un opérateur de réseau"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Exiger un code PIN ou un mot de passe numérique pour déchiffrer la tablette à chaque fois qu\'elle est allumée"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Exiger un code PIN ou un mot de passe numérique pour déchiffrer le téléphone à chaque fois qu\'il est allumé"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Chiffré"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Vous pouvez chiffrer vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre tablette chiffrée, vous devez saisir un code PIN ou un mot de passe numérique pour la déchiffrer à chaque fois que vous l\'allumez. Vous ne pouvez déchiffrer votre tablette qu\'en rétablissant la configuration d\'usine, ce qui effacera l\'ensemble de vos données."\n\n"Le chiffrement peut prendre une heure, voire plus. La batterie doit être chargée lors du démarrage du processus, et la tablette doit rester branchée jusqu\'à la fin. Si vous interrompez le processus, vous perdrez certaines de vos données, voire la totalité."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Vous pouvez chiffrer vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre téléphone chiffré, vous devez saisir un code PIN ou un mot de passe numérique pour le déchiffrer à chaque fois que vous l\'allumez. Vous ne pouvez déchiffrer votre téléphone qu\'en rétablissant la configuration d\'usine, ce qui effacera l\'ensemble de vos données."\n\n"Le chiffrement peut prendre une heure, voire plus. La batterie doit être chargée lors du démarrage du processus, et le téléphone doit rester branché jusqu\'à la fin. Si vous interrompez le processus, vous perdrez certaines de vos données, voire la totalité."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Vous pouvez chiffrer vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre tablette chiffrée, vous devez saisir un code PIN ou un mot de passe numérique pour la déchiffrer à chaque fois que vous l\'allumez. Vous ne pouvez déchiffrer votre tablette qu\'en rétablissant la configuration d\'usine, ce qui effacera l\'ensemble de vos données.\n\nLe chiffrement peut prendre une heure, voire plus. La batterie doit être chargée lors du démarrage du processus, et la tablette doit rester branchée jusqu\'à la fin. Si vous interrompez le processus, vous perdrez certaines de vos données, voire la totalité."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Vous pouvez chiffrer vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre téléphone chiffré, vous devez saisir un code PIN ou un mot de passe numérique pour le déchiffrer à chaque fois que vous l\'allumez. Vous ne pouvez déchiffrer votre téléphone qu\'en rétablissant la configuration d\'usine, ce qui effacera l\'ensemble de vos données.\n\nLe chiffrement peut prendre une heure, voire plus. La batterie doit être chargée lors du démarrage du processus, et le téléphone doit rester branché jusqu\'à la fin. Si vous interrompez le processus, vous perdrez certaines de vos données, voire la totalité."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Chiffrer la tablette"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Chiffrer le téléphone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Veuillez charger votre batterie, puis réessayer."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Réessayez dans <xliff:g id="DELAY">^1</xliff:g> secondes."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Saisissez votre mot de passe."</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Échec du chiffrement"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre tablette ne sont plus accessibles."\n\n"Pour continuer d\'utiliser votre tablette, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre tablette."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre téléphone ne sont plus accessibles."\n\n"Pour continuer d\'utiliser votre téléphone, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre tablette ne sont plus accessibles.\n\nPour continuer d\'utiliser votre tablette, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre tablette."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Impossible de terminer le chiffrement, car celui-ci a été interrompu. Par conséquent, les données de votre téléphone ne sont plus accessibles.\n\nPour continuer d\'utiliser votre téléphone, vous devez rétablir la configuration d\'usine. Une fois cette opération terminée, vous pourrez restaurer toutes les données sauvegardées sur votre compte Google lors de la nouvelle configuration de votre téléphone."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Changer le mode de saisie"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Sélect. verr. écran"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Verrouillage secondaire"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Connexion en cours…"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Connecté"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponible"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"En cours d\'utilisation"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Paramètres d\'affichage"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Voulez-vous vraiment vous déconnecter ?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Cette opération va mettre fin à votre connexion avec :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Désactivé"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponible, car la NFC est désactivée"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Lorsque cette fonctionnalité est activée, vous pouvez partager le contenu d\'une application avec un appareil compatible NFC en rapprochant les appareils. Vous pouvez, par exemple, partager des pages de navigateur, des vidéos YouTube, des contacts et plus encore."\n\n"Il vous suffit de rapprocher les appareils (en les plaçant dos à dos), puis d\'appuyer sur votre écran. L\'application détermine le contenu à transférer."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Lorsque cette fonctionnalité est activée, vous pouvez partager le contenu d\'une application avec un appareil compatible NFC en rapprochant les appareils. Vous pouvez, par exemple, partager des pages de navigateur, des vidéos YouTube, des contacts et plus encore.\n\nIl vous suffit de rapprocher les appareils (en les plaçant dos à dos), puis d\'appuyer sur votre écran. L\'application détermine le contenu à transférer."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Identification du service réseau"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Autoriser les applications sur d\'autres appareils à identifier les applications sur celui-ci"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sécurisé par <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", sécurisé par <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Aucune"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pour améliorer la précision de la position et à d\'autres fins, <xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer la recherche de réseaux, même lorsque le Wi-Fi est désactivé."\n\n"Donner cette autorisation à toutes les applications souhaitant activer la recherche de réseaux ?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pour améliorer la précision de la position et à d\'autres fins, <xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer la recherche de réseaux, même lorsque le Wi-Fi est désactivé.\n\nDonner cette autorisation à toutes les applications souhaitant activer la recherche de réseaux ?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Autoriser"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Refuser"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Se connecter"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"AVERTISSEMENT : Des frais supplémentaires de connexion à Internet peuvent être appliqués par votre opérateur.\n\nLa configuration de la tablette peut générer une forte activité sur le réseau."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AVERTISSEMENT : Des frais supplémentaires de connexion à Internet peuvent être appliqués par votre opérateur.\n\nLa configuration du téléphone peut générer une forte activité sur le réseau."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"AVERTISSEMENT : Vous ne pourrez vérifier que vos logiciels sont à jour sur votre tablette que lorsque vous disposerez d\'une connexion à Internet."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"AVERTISSEMENT : Vous ne pourrez vérifier que vos logiciels sont à jour sur votre téléphone que lorsque vous disposerez d\'une connexion à Internet."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Connexion impossible de la tablette à ce réseau Wi-Fi."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"Code PIN de la carte SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Code PIN incorrect."</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Les codes PIN ne correspondent pas."</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Impossible de modifier le code PIN."\n"Le code PIN est peut-être incorrect."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Impossible de modifier le code PIN.\nLe code PIN est peut-être incorrect."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Le code PIN de la carte SIM a été modifié."</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Impossible de changer l\'état de verrouillage de la carte SIM."\n"Le code PIN est peut-être incorrect."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Impossible de changer l\'état de verrouillage de la carte SIM.\nLe code PIN est peut-être incorrect."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Annuler"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"État de la tablette"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Restaurer valeurs d\'usine"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Effacer toutes les données de la tablette"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Effacer toutes les données du téléphone"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :"\n\n<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Cette action effacera toutes les données du "<b>"stockage interne"</b>" de votre téléphone, y compris :"\n\n<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Vous êtes actuellement connecté aux comptes suivants :"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Cette action effacera toutes les données du "<b>"stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musique"</li>\n<li>"Photos"</li>\n<li>"Autres données utilisateur"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"carte SD"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Voir processus en cache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Réinitialiser préf. applis"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Réinitialiser préférences ?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Cette opération entraîne la réinitialisation de toutes les préférences pour : "\n\n" "<li>"les applications désactivées ;"</li>\n" "<li>"les notifications des applications désactivées ;"</li>\n" "<li>"les applications utilisées par défaut pour certaines actions ;"</li>\n" "<li>"les restrictions relatives aux données en arrière-plan pour les applications."</li>\n\n" Vous ne perdrez aucune des données relatives à ces applications."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Cette opération entraîne la réinitialisation de toutes les préférences pour : \n\n "<li>"les applications désactivées ;"</li>\n" "<li>"les notifications des applications désactivées ;"</li>\n" "<li>"les applications utilisées par défaut pour certaines actions ;"</li>\n" "<li>"les restrictions relatives aux données en arrière-plan pour les applications."</li>\n\n" Vous ne perdrez aucune des données relatives à ces applications."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Réinitialiser applis"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gérer l\'espace"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrer"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Appuyez sur Ctrl+Espace pour changer disposition"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Par défaut"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Dispositions du clavier"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dictionnaire personnel"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dictionnaire personnel"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Dictionnaires personnels"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Dictionnaire personnel"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Ajouter"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Ajouter au dictionnaire"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Inclure une option permettant d\'établir un rapport de bug dans le menu de démarrage"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Rester activé"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"L\'écran ne se met jamais en veille lors du chargement"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activer les journaux par espionnage HCI Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Enregistrer tous les paquets HCI Bluetooth dans un fichier"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Sélect. moteur d\'exécution"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Sélect. moteur d\'exécution"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Redémarrer pour remplacer le moteur d\'exécution <xliff:g id="OLD">%1$s</xliff:g> par <xliff:g id="NEW">%2$s</xliff:g> ?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Positions fictives"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Autoriser les positions fictives"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Autoriser le débogage USB ?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Protéger mémoire de stockage USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Les applis doivent demander l\'autorisation pour lire la mémoire."</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Protéger mémoire stockage USB ?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Lorsque la mémoire de stockage USB est protégée, les applications doivent demander l\'autorisation de lire les données de la mémoire de stockage externe."\n\n"Certaines applications peuvent ne pas fonctionner jusqu\'à ce que leurs développeurs les mettent à jour."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Lorsque la mémoire de stockage USB est protégée, les applications doivent demander l\'autorisation de lire les données de la mémoire de stockage externe.\n\nCertaines applications peuvent ne pas fonctionner jusqu\'à ce que leurs développeurs les mettent à jour."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Protéger la carte SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Les applications doivent demander autorisation de lire carte SD."</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Protéger la carte SD ?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Lorsque la carte SD est protégée, les applications doivent demander l\'autorisation de lire les données de la mémoire de stockage externe."\n\n"Certaines applications peuvent ne pas fonctionner jusqu\'à ce que leurs développeurs les mettent à jour."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Lorsque la carte SD est protégée, les applications doivent demander l\'autorisation de lire les données de la mémoire de stockage externe.\n\nCertaines applications peuvent ne pas fonctionner jusqu\'à ce que leurs développeurs les mettent à jour."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal local"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Activer l\'application Terminal permettant l\'accès au shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Choisir un gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Choisir un widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Créer un widget et autoriser l\'accès ?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Services"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Système"</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_screen_magnification_summary" msgid="2380627654189671754">"Lorsque cette fonctionnalité est activée, vous pouvez effectuer des zooms avant et arrière en appuyant trois fois sur l\'écran.\n\nLorsque vous effectuez un zoom avant, vous pouvez :\n"<ul><li>"Effectuer un panoramique : faites glisser deux doigts ou plus sur l\'écran."</li>\n<li>"Régler le niveau de zoom : pincez deux doigts ou plus, ou écartez-les."</li></ul>\n\n"Vous pouvez également agrandir le contenu se trouvant sous votre doigt en appuyant trois fois sur l\'écran et en prolongeant la troisième pression. Lorsque la loupe est activée, vous pouvez faire glisser votre doigt sur l\'écran pour en explorer les différentes parties. Relevez votre doigt pour revenir à l\'état précédent.\n\nRemarque : vous pouvez appuyer trois fois sur l\'écran pour agrandir le contenu partout, sauf sur le clavier et la barre de navigation."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Raccourci d\'accessibilité"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Activé"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Désactivé"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Lorsque cette fonctionnalité est activée, vous pouvez rapidement activer les fonctionnalités d\'accessibilité en deux étapes :"\n\n"Étape 1 : Appuyez de manière prolongée sur le bouton Marche/Arrêt jusqu\'à ce que le téléphone sonne ou vibre."\n\n"Étape 2 : Appuyez de manière prolongée avec deux doigts jusqu\'à ce que vous entendiez la confirmation audio."\n\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_global_gesture_preference_description" msgid="750438015254396963">"Lorsque cette fonctionnalité est activée, vous pouvez rapidement activer les fonctionnalités d\'accessibilité en deux étapes :\n\nÉtape 1 : Appuyez de manière prolongée sur le bouton Marche/Arrêt jusqu\'à ce que le téléphone sonne ou vibre.\n\nÉtape 2 : Appuyez de manière prolongée avec deux doigts jusqu\'à ce que vous entendiez la confirmation audio.\n\nSi l\'appareil est utilisé par plusieurs personnes, l’utilisation de ce raccourci sur l\'écran de verrouillage active l\'accessibilité de manière temporaire jusqu\'au déverrouillage de l\'appareil."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Grands caractères"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Loupe"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Mise à jour auto de la loupe"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack fournit des commentaires audio aux personnes malvoyantes. Voulez-vous l\'installer gratuitement depuis l\'Android Market ?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Aucune description fournie"</string>
     <string name="settings_button" msgid="3006713718908152930">"Paramètres"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Impression"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Paramètres d\'impression"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Services"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utiliser <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"Le service <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> peut recevoir les tâches d\'impression. Il est possible que les documents que vous imprimez contiennent des données confidentielles."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Aucun service installé"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Paramètres"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Ajouter des imprimantes"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Activé"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Désactivé"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batterie"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Répartition de l\'utilisation de la batterie"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Info d\'utilisation batterie indispo"</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi actif"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablette"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Téléphone"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Données envoyées"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Données reçues"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Données mobiles envoyées"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Données mobiles reçues"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Données Wi‑Fi envoyées"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Données Wi‑Fi reçues"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Vidéo"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Durée d\'activation"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ton"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Affecte le ton utilisé par la synthèse vocale"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Langue"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Langue non sélectionnée"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Définir la langue utilisée par la synthèse vocale"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Écouter un échantillon"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Lire une courte démonstration de la synthèse vocale"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"L\'EAP n\'est pas compatible."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Impossible de paramétrer de connexion Wi-Fi EAP lors de la configuration. Une fois celle-ci effectuée, vous pourrez le faire via Paramètres &gt; Sans fil et réseaux."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"La connexion peut prendre quelques minutes…"</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Appuyez sur "<b>"Suivant"</b>" pour poursuivre la configuration."\n\n"Appuyez sur "<b>"Précédent"</b>" pour vous connecter à un autre réseau Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Appuyez sur "<b>"Suivant"</b>" pour poursuivre la configuration.\n\nAppuyez sur "<b>"Précédent"</b>" pour vous connecter à un autre réseau Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronisation activée"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronisation désactivée"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Erreur de synchronisation."</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Déboguer les conflits GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Désact. superpos. matér."</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Toujours utiliser le GPU pour la composition écran"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Activer les traces OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Désactiver données arrière-plan sur réseaux mobiles. Utiliser autres réseaux si dispos."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Pour restreindre les données en arrière-plan, définissez un quota de données mobiles."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Limiter les données en arrière-plan ?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Cette fonctionnalité peut empêcher certaines applications de s\'exécuter lorsque celles-ci sont dépendantes des données en arrière-plan et que seuls des réseaux mobiles sont disponibles."\n\n"Vous trouverez des options plus adaptées en matière de contrôle de la consommation des données dans les paramètres de l\'application."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Cette fonctionnalité peut empêcher certaines applications de s\'exécuter lorsque celles-ci sont dépendantes des données en arrière-plan et que seuls des réseaux mobiles sont disponibles.\n\nVous trouverez des options plus adaptées en matière de contrôle de la consommation des données dans les paramètres de l\'application."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"La limitation des données en arrière-plan n\'est disponible que lorsque vous avez défini un plafond de données mobiles."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Activer synchro auto données ?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Les modifications que vous apportez à vos comptes sur le Web sont automatiquement copiées sur votre tablette."\n\n"Certains comptes permettent également de copier automatiquement sur le Web toutes les modifications que vous effectuez sur la tablette. C\'est le cas des comptes Google."\n\n"Pour sélectionner le type d\'informations à synchroniser au sein de chaque compte, accédez à Paramètres &gt; Comptes."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Les modifications que vous apportez à vos comptes sur le Web sont automatiquement copiées sur votre téléphone."\n\n"Certains comptes permettent également de copier automatiquement sur le Web toutes les modifications que vous effectuez sur le téléphone. C\'est le cas des comptes Google."\n\n"Pour sélectionner le type d\'informations à synchroniser au sein de chaque compte, accédez à Paramètres &gt; Comptes."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Les modifications que vous apportez à vos comptes sur le Web sont automatiquement copiées sur votre tablette.\n\nCertains comptes permettent également de copier automatiquement sur le Web toutes les modifications que vous effectuez sur la tablette. C\'est le cas des comptes Google.\n\nPour sélectionner le type d\'informations à synchroniser au sein de chaque compte, accédez à Paramètres &gt; Comptes."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Les modifications que vous apportez à vos comptes sur le Web sont automatiquement copiées sur votre téléphone.\n\nCertains comptes permettent également de copier automatiquement sur le Web toutes les modifications que vous effectuez sur le téléphone. C\'est le cas des comptes Google.\n\nPour sélectionner le type d\'informations à synchroniser au sein de chaque compte, accédez à Paramètres &gt; Comptes."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Désactiver synchro auto données ?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Cela limite la consommation des données et l\'utilisation de la batterie, mais vous devrez synchroniser manuellement chaque compte pour recueillir les informations récentes. Par ailleurs, vous ne recevrez pas de notifications en cas de mise à jour."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Date de réinitialisation du cycle de consommation"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Définir avertissement utilisation des données"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Définir un quota d\'utilisation des données"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitation de la consommation de données mobiles"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Votre connexion Internet mobile sera désactivée une fois le seuil défini atteint."\n\n"La consommation des données étant mesurée par la tablette, celle mesurée par votre opérateur peut différer. Nous vous recommandons donc de définir un seuil plus bas."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Votre connexion Internet mobile sera désactivée une fois le seuil défini atteint."\n\n"La consommation des données étant mesurée par le téléphone, celle mesurée par votre opérateur peut différer. Nous vous recommandons donc de définir un seuil plus bas."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Votre connexion Internet mobile sera désactivée une fois le seuil défini atteint.\n\nLa consommation des données étant mesurée par la tablette, celle mesurée par votre opérateur peut différer. Nous vous recommandons donc de définir un seuil plus bas."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Votre connexion Internet mobile sera désactivée une fois le seuil défini atteint.\n\nLa consommation des données étant mesurée par le téléphone, celle mesurée par votre opérateur peut différer. Nous vous recommandons donc de définir un seuil plus bas."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Limiter les données en arrière-plan ?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Si vous limitez les données mobiles en arrière-plan, certains services et applications ne fonctionneront que si vous êtes connecté à un réseau Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Si vous limitez les données mobiles en arrière-plan, certaines applications et certains services ne fonctionneront pas correctement, sauf si vous êtes connecté à un réseau Wi-Fi."\n\n"Ce paramètre affecte tous les utilisateurs de cette tablette."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Si vous limitez les données mobiles en arrière-plan, certaines applications et certains services ne fonctionneront pas correctement, sauf si vous êtes connecté à un réseau Wi-Fi."\n\n"Ce paramètre affecte tous les utilisateurs de ce téléphone."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Si vous limitez les données mobiles en arrière-plan, certaines applications et certains services ne fonctionneront pas correctement, sauf si vous êtes connecté à un réseau Wi-Fi.\n\nCe paramètre affecte tous les utilisateurs de cette tablette."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Si vous limitez les données mobiles en arrière-plan, certaines applications et certains services ne fonctionneront pas correctement, sauf si vous êtes connecté à un réseau Wi-Fi.\n\nCe paramètre affecte tous les utilisateurs de ce téléphone."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"alerte"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"plafond"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Applications supprimées"</string>
@@ -1845,8 +1863,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Utilisateur"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil limité"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Ajouter un utilisateur"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Vous pouvez partager cet appareil avec d\'autres personnes en créant des utilisateurs. Chaque utilisateur dispose de son propre espace, où il peut personnaliser, entre autres, ses applications et son fond d\'écran. Chacun peut également modifier les paramètres de la tablette, tels que le Wi-Fi, qui affectent tous les utilisateurs."\n\n"Lorsque vous créez un utilisateur, celui-ci doit suivre une procédure de configuration."\n\n"N\'importe quel utilisateur peut accepter, au nom de tous les autres, des autorisations mises à jour relatives aux applications."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"Lorsque vous créez un nouvel utilisateur, celui-ci doit suivre une procédure d\'installation."\n\n"N\'importe quel utilisateur peut accepter des autorisations mises à jour pour les applications au nom de tous les autres."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Vous pouvez partager cet appareil avec d\'autres personnes en créant des utilisateurs. Chaque utilisateur dispose de son propre espace, où il peut personnaliser, entre autres, ses applications et son fond d\'écran. Chacun peut également modifier les paramètres de la tablette, tels que le Wi-Fi, qui affectent tous les utilisateurs.\n\nLorsque vous créez un utilisateur, celui-ci doit suivre une procédure de configuration.\n\nN\'importe quel utilisateur peut accepter, au nom de tous les autres, des autorisations mises à jour relatives aux applications."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Lorsque vous créez un nouvel utilisateur, celui-ci doit suivre une procédure d\'installation.\n\nN\'importe quel utilisateur peut accepter des autorisations mises à jour pour les applications au nom de tous les autres."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurer l\'utilisateur ?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Assurez-vous que la personne est disponible, et qu\'elle peut utiliser la tablette et configurer son espace."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Configurer le profil maintenant ?"</string>
@@ -1877,6 +1895,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ce paramètre affecte tous les utilisateurs de ce téléphone."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Modifier la langue"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Modifier la taille de la police"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Restrictions"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Annuler les restrictions"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Modifier le code PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Afficher notifications"</string>
     <string name="help_label" msgid="1107174367904110532">"Aide"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Compte pour contenu"</string>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 6ae78a90fee..678b837713a 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"स्थान"</item>
     <item msgid="255608127647030286">"व्यक्तिगत"</item>
     <item msgid="4588829735729884491">"संदेश सेवा"</item>
-    <item msgid="8971765125227378270">"उपकरण"</item>
+    <item msgid="886742181977884584">"मीडिया"</item>
+    <item msgid="7924928667052300589">"उपकरण"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"अस्पष्ट स्थान"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"ऑडियो चलाएं"</item>
     <item msgid="8374996688066472414">"क्लिपबोर्ड पढ़ें"</item>
     <item msgid="3045529469061083747">"क्लिपबोर्ड बदलें"</item>
+    <item msgid="5124443975763747838">"मीडिया बटन"</item>
+    <item msgid="4547883971364273343">"ऑडियो फ़ोकस"</item>
+    <item msgid="2603878814882344450">"मास्टर वॉल्यूम"</item>
+    <item msgid="7136963238377062018">"ध्वनि वॉल्यूम"</item>
+    <item msgid="4270236897655923007">"रिंग वॉल्यूम"</item>
+    <item msgid="6325739889222559394">"मीडिया वॉल्‍यूम"</item>
+    <item msgid="5762123934816216821">"अलार्म वॉल्यूम"</item>
+    <item msgid="785049718065337473">"सूचना वॉल्‍यूम"</item>
+    <item msgid="6700305533746877052">"bluetooth वॉल्यूम"</item>
+    <item msgid="2029227495214047094">"सचेत रखें"</item>
+    <item msgid="26109888160231211">"मॉनिटर का स्थान"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"स्थान"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"ऑडियो चलाएं"</item>
     <item msgid="136815868796597058">"क्लिपबोर्ड पढ़ें"</item>
     <item msgid="5238692940326972503">"क्लिपबोर्ड बदलें"</item>
+    <item msgid="5753789168376302997">"मीडिया बटन"</item>
+    <item msgid="3265262911688671938">"ऑडियो फ़ोकस"</item>
+    <item msgid="2098976479485046797">"मास्टर वॉल्यूम"</item>
+    <item msgid="5660213838861789350">"ध्वनि वॉल्यूम"</item>
+    <item msgid="7983336752371254444">"रिंग वॉल्यूम"</item>
+    <item msgid="7878027809189330917">"मीडिया वॉल्‍यूम"</item>
+    <item msgid="7260546305036218513">"अलार्म वॉल्यूम"</item>
+    <item msgid="9103719301075748925">"सूचना वॉल्‍यूम"</item>
+    <item msgid="7025966722295861512">"Bluetooth वॉल्‍यूम"</item>
+    <item msgid="4665183401128289653">"सचेत रखें"</item>
+    <item msgid="8584357129746649222">"स्थान"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"कम"</item>
     <item msgid="2560532955514699713">"मध्यम"</item>
     <item msgid="2372711992605524591">"अधिक"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (डीबग)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Dalvik का उपयोग करें"</item>
+    <item msgid="5131846588686178907">"ART का उपयोग करें"</item>
+    <item msgid="4530003713865319928">"ART डीबग बिल्ड का उपयोग करें"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"कभी न जांचें"</item>
     <item msgid="6042769699089883931">"केवल DRM सामग्री जांचें"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"रेखाओं के रूप में स्‍क्रीन पर"</item>
     <item msgid="120512413928262547">"adb shell dumpsys gfxinfo में"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"बंद"</item>
+    <item msgid="7688197031296835369">"ओवरड्रॉ क्षेत्रों को दिखाएं"</item>
+    <item msgid="8332661909019981149">"ओवरड्रॉ काउंटर दिखाएं"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"मानक सीमा"</item>
     <item msgid="4071574792028999443">"कोई पृष्ठभूमि प्रक्रियाएं नहीं"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index fb6bb2ef779..a99ff8beca8 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -275,8 +275,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_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>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"हर बार अपना टेबलेट चालू करते समय आपको उसे डीक्रिप्‍ट करने के लिए एक संख्‍यात्‍मक पिन या पासवर्ड की आवश्‍यकता होती है"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"हर बार अपना फ़ोन चालू करते समय आपको उसे डीक्रिप्‍ट करने के लिए एक संख्‍यात्‍मक पिन या पासवर्ड की आवश्‍यकता होती है"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"एन्‍िक्रप्ट किया गया"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"आप अपने खाते, सेटिंग, डाउनलोड किए गए एप्लिकेशन और उनका डेटा, मीडिया, और अन्‍य फ़ाइलें एन्क्रिप्ट कर सकते हैं. जब आप अपना टेबलेट एन्क्रिप्ट कर लें, तो हर बार उसे चालू करने पर आपको उसे डीक्रिप्ट करने के लिए संख्यात्मक पिन या पासवर्ड लिखना होगा. आप अपना सभी डेटा मिटाकर, फ़ैक्टरी डेटा रीसेट किए जाने के अलावा अपने टेबलेट को डीक्रिप्ट नहीं कर सकते."\n\n"एन्क्रिप्शन एक घंटा या अधिक समय लेता है. आपको चार्ज की हुई बैटरी से प्रारंभ करना चाहिए और एन्क्रिप्शन पूर्ण होने तक अपने टेबलेट को प्लग इन रखना चाहिए. यदि आप एन्क्रिप्शन प्रक्रिया को बाधित करते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"आप अपने खाते, सेटिंग, डाउनलोड किए गए एप्लिकेशन और उनका डेटा, मीडिया, और अन्‍य फ़ाइलें एन्क्रिप्ट कर सकते हैं. जब आप अपना फ़ोन एन्क्रिप्ट कर लें, तो हर बार उसे चालू करने पर आपको उसे डीक्रिप्ट करने के लिए संख्यात्मक पिन या पासवर्ड लिखना होगा. आप अपना सभी डेटा मिटाकर, फ़ैक्टरी डेटा रीसेट किए जाने के अलावा अपने टेबलेट को डीक्रिप्ट नहीं कर सकते."\n\n"एन्क्रिप्शन एक घंटा या अधिक समय लेता है. आपको चार्ज की हुई बैटरी से प्रारंभ करना चाहिए और एन्क्रिप्शन पूर्ण होने तक अपने फ़ोन को प्लग इन रखना चाहिए. यदि आप एन्क्रिप्शन प्रक्रिया को बाधित करते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"आप अपने खाते, सेटिंग, डाउनलोड किए गए एप्लिकेशन और उनका डेटा, मीडिया, और अन्‍य फ़ाइलें एन्क्रिप्ट कर सकते हैं. जब आप अपना टेबलेट एन्क्रिप्ट कर लें, तो हर बार उसे चालू करने पर आपको उसे डीक्रिप्ट करने के लिए संख्यात्मक पिन या पासवर्ड लिखना होगा. आप अपना सभी डेटा मिटाकर, फ़ैक्टरी डेटा रीसेट किए जाने के अलावा अपने टेबलेट को डीक्रिप्ट नहीं कर सकते.\n\nएन्क्रिप्शन एक घंटा या अधिक समय लेता है. आपको चार्ज की हुई बैटरी से प्रारंभ करना चाहिए और एन्क्रिप्शन पूर्ण होने तक अपने टेबलेट को प्लग इन रखना चाहिए. यदि आप एन्क्रिप्शन प्रक्रिया को बाधित करते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"आप अपने खाते, सेटिंग, डाउनलोड किए गए एप्लिकेशन और उनका डेटा, मीडिया, और अन्‍य फ़ाइलें एन्क्रिप्ट कर सकते हैं. जब आप अपना फ़ोन एन्क्रिप्ट कर लें, तो हर बार उसे चालू करने पर आपको उसे डीक्रिप्ट करने के लिए संख्यात्मक पिन या पासवर्ड लिखना होगा. आप अपना सभी डेटा मिटाकर, फ़ैक्टरी डेटा रीसेट किए जाने के अलावा अपने टेबलेट को डीक्रिप्ट नहीं कर सकते.\n\nएन्क्रिप्शन एक घंटा या अधिक समय लेता है. आपको चार्ज की हुई बैटरी से प्रारंभ करना चाहिए और एन्क्रिप्शन पूर्ण होने तक अपने फ़ोन को प्लग इन रखना चाहिए. यदि आप एन्क्रिप्शन प्रक्रिया को बाधित करते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"टेबलेट एन्‍क्रिप्‍ट करें"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"फ़ोन एन्‍क्रिप्‍ट करें"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"अपनी बैटरी चार्ज करें और पुन: प्रयास करें."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> सेकंड में पुन: प्रयास करें."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"अपना पासवर्ड लिखें"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"एन्क्रिप्‍शन विफल"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"एन्‍क्रिप्‍शन बाधित किया था और पूर्ण नहीं हो सकता. परिणामस्‍वरूप, आपके टेबलेट का डेटा अब पहुंच योग्‍य नहीं है. "\n\n" अपने टेबलेट का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करना होगा. जब आप रीसेट करने के बाद अपना टेबलेट सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"एन्‍क्रिप्‍शन बाधित था और पूर्ण नहीं हो सकता. इसके परिणामस्‍वरूप, आपके फ़ोन का डेटा अब पहुंच योग्‍य नहीं है. "\n\n"अपने फ़ोन का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करना होगा. जब आप रीसेट करने के बाद अपना फ़ोन सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"एन्‍क्रिप्‍शन बाधित किया था और पूर्ण नहीं हो सकता. परिणामस्‍वरूप, आपके टेबलेट का डेटा अब पहुंच योग्‍य नहीं है. \n\n अपने टेबलेट का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करना होगा. जब आप रीसेट करने के बाद अपना टेबलेट सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"एन्‍क्रिप्‍शन बाधित था और पूर्ण नहीं हो सकता. इसके परिणामस्‍वरूप, आपके फ़ोन का डेटा अब पहुंच योग्‍य नहीं है. \n\nअपने फ़ोन का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करना होगा. जब आप रीसेट करने के बाद अपना फ़ोन सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"इनपुट पद्धति‍ स्विच करें"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"स्‍क्रीन लॉक चुनें"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"बैकअप लॉक चुनें"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"कनेक्ट कर रहा है"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"कनेक्ट किया गया"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"उपलब्ध"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"उपयोग में"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"प्रदर्शन सेटिंग"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"डिस्‍कनेक्‍ट करें?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"इससे &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; के साथ आपका कनेक्शन समाप्त हो जाएगा"</string>
@@ -532,7 +533,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="8850161330437693895">"Wi‑Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> द्वारा सुरक्षित"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> द्वारा सुरक्षित"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"कोई नहीं"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"स्थान की सटीकता को बेहतर बनाने और अन्य प्रयोजनों के लिए, Wi-Fi बंद होने पर भी <xliff:g id="APP_NAME">%1$s</xliff:g> नेटवर्क स्कैनिंग को चालू करना चाहता है."\n\n"इसकी अनुमति उन सभी एप्लिकेशन के लिए दें जो स्कैन करना चाहते हैं?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"स्थान की सटीकता को बेहतर बनाने और अन्य प्रयोजनों के लिए, Wi-Fi बंद होने पर भी <xliff:g id="APP_NAME">%1$s</xliff:g> नेटवर्क स्कैनिंग को चालू करना चाहता है.\n\nइसकी अनुमति उन सभी एप्लिकेशन के लिए दें जो स्कैन करना चाहते हैं?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"अनुमति दें"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"अस्वीकार करें"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"कनेक्‍ट करें"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"चेतावनी: आपको अतिरिक्त कैरियर डेटा शुल्क लग सकते हैं.\n\nटेबलेट सेटअप के लिए महत्वपूर्ण नेटवर्क गतिविधि की आवश्यकता हो सकती है."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"चेतावनी: आपको अतिरिक्त कैरियर डेटा शुल्क लग सकते हैं.\n\nफ़ोन सेटअप के लिए अत्यधिक नेटवर्क गतिविधि की आवश्यकता हो सकती है."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"चेतावनी: जब तक आपके पास इंटरनेट कनेक्शन न हो, तब तक टेबलेट सत्यापित नहीं कर पाएगा कि आपका सॉफ़्टवेयर अद्यतित है."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"चेतावनी: जब तक आपके पास इंटरनेट कनेक्शन न हो, तब तक फ़ोन सत्यापित नहीं कर पाएगा कि आपका सॉफ़्टवेयर अद्यतित है."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"टेबलेट इस Wi-Fi नेटवर्क से कनेक्ट नहीं हो सका था."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"सिम पिन"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"गलत पिन"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"पिनों का मिलान नहीं होता"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"पिन नहीं बदल सकता."\n"संभवत: गलत पिन."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"पिन नहीं बदल सकता.\nसंभवत: गलत पिन."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"सिम पिन सफलतापूर्वक बदला गया"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"सिम कार्ड लॉक स्‍थिति नहीं बदल सकता."\n"संभवत: गलत पिन."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"सिम कार्ड लॉक स्‍थिति नहीं बदल सकता.\nसंभवत: गलत पिन."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"ठीक"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"रद्द करें"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"टेबलेट स्‍थिति"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"फ़ैक्टरी डेटा रीसेट"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"टेबलेट से सभी डेटा मिटाएं"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"फ़ोन से सभी डेटा मिटाएं"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"इससे आपके टेबलेट के "<b>"आंतरिक संग्रहण"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:"\n\n<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और एप्‍लिकेशन डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए एप्‍लिकेशन"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"इससे आपके फ़ोन के "<b>"आंतरिक संग्रहण"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:"\n\n<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और एप्‍लिकेशन डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए एप्‍लिकेशन"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"आप वर्तमान में निम्‍न खातों में साइन इन हैं:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"इससे आपके टेबलेट के "<b>"आंतरिक संग्रहण"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और एप्‍लिकेशन डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए एप्‍लिकेशन"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"इससे आपके फ़ोन के "<b>"आंतरिक संग्रहण"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और एप्‍लिकेशन डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए एप्‍लिकेशन"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"आप वर्तमान में निम्‍न खातों में साइन इन हैं:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"संगीत"</li>\n<li>"फ़ोटो"</li>\n<li>"अन्‍य उपयोगकर्ता डेटा"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"संगीत, चित्र और अन्‍य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>" USB संग्रहण"</b>" मिटाना होगा."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"संगीत, चित्र और अन्‍य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>"SD कार्ड"</b>" को साफ़ करना होगा."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"कैश की गई प्रक्रियाएं दिखाएं"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"एप्लि. प्राथमिकताएं रीसेट करें"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"एप्लि. प्राथमिकताएं रीसेट करें?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"इससे इनके लिए सभी प्राथमिकताएं रीसेट हो जाएंगी:"\n\n" "<li>"अक्षम एप्लिकेशन"</li>\n" "<li>"अक्षम एप्लिकेशन सूचनाएं"</li>\n" "<li>"क्रियाओं के लिए डिफ़ॉल्ट एप्लिकेशन"</li>\n" "<li>"एप्लिकेशन के लिए पृष्ठभूमि डेटा प्रतिबंध"</li>\n\n" आपका एप्लिकेशन डेटा नहीं खोएगा."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"इससे इनके लिए सभी प्राथमिकताएं रीसेट हो जाएंगी:\n\n "<li>"अक्षम एप्लिकेशन"</li>\n" "<li>"अक्षम एप्लिकेशन सूचनाएं"</li>\n" "<li>"क्रियाओं के लिए डिफ़ॉल्ट एप्लिकेशन"</li>\n" "<li>"एप्लिकेशन के लिए पृष्ठभूमि डेटा प्रतिबंध"</li>\n\n" आपका एप्लिकेशन डेटा नहीं खोएगा."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"एप्लिकेशन रीसेट करें"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"स्‍थान प्रबंधित करें"</string>
     <string name="filter" msgid="2018011724373033887">"फ़िल्टर"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"स्‍विच करने हेतु, Control-Spacebar दबाएं"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"डिफ़ॉल्ट"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"कीबोर्ड लेआउट"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"उपयोगकर्ता शब्‍दकोश"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"व्यक्तिगत डिक्शनरी"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"व्यक्तिगत डिक्शनरी"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"व्यक्तिगत शब्दकोष"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"जोड़ें"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"शब्‍दकोश में जोड़ें"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"बग रिपोर्ट लेने के लिए पावर मेनू में विकल्‍प शामिल करें"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"सचेत रहें"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"चार्ज होने के दौरान स्‍क्रीन कभी निष्‍क्रिय नहीं होगी"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI स्‍नूप लॉग सक्षम करें"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"फ़ाइल के सभी Bluetooth HCI पैकेट कैप्‍चर करें"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"रनटाइम चुनें"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"रनटाइम चुनें"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"रनटाइम को <xliff:g id="OLD">%1$s</xliff:g> से <xliff:g id="NEW">%2$s</xliff:g> में बदलने के लिए रीबूट करें?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"कृत्रिम स्‍थानों को अनुमति दें"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"कृत्रिम स्‍थानों को अनुमति दें"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB डीबग करने की अनुमति दें?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USB संग्रहण सुरक्षित करें"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"USB संग्रहण पढ़ने हेतु एप्‍लिकेशन को अनुमति का अनुरोध करना होगा"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"USB संग्रहण सुरक्षित करें?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"USB संग्रहण के सुरक्षित होने पर, एप्‍लिकेशन को बाहरी संग्रहण से डेटा पढ़ने की अनुमति का अनुरोध करना होगा."\n\n"हो सकता है कुछ एप्‍लिकेशन उनके डेवलपर द्वारा अपडेट नहीं किए जाने तक कार्य न करें."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"USB संग्रहण के सुरक्षित होने पर, एप्‍लिकेशन को बाहरी संग्रहण से डेटा पढ़ने की अनुमति का अनुरोध करना होगा.\n\nहो सकता है कुछ एप्‍लिकेशन उनके डेवलपर द्वारा अपडेट नहीं किए जाने तक कार्य न करें."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"SD कार्ड सुरक्षित करें"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"SD कार्ड पढ़ने के लिए एप्‍लिकेशन को अनुमति का अनुरोध करना होगा"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SD कार्ड सुरक्षित करें?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SD कार्ड के सुरक्षित होने पर, एप्‍लिकेशन को बाहरी संग्रहण से डेटा पढ़ने की अनुमति का अनुरोध करना होगा."\n\n"हो सकता है कुछ एप्‍लिकेशन उनके डेवलपर द्वारा अपडेट नहीं किए जाने तक कार्य न करें."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SD कार्ड के सुरक्षित होने पर, एप्‍लिकेशन को बाहरी संग्रहण से डेटा पढ़ने की अनुमति का अनुरोध करना होगा.\n\nहो सकता है कुछ एप्‍लिकेशन उनके डेवलपर द्वारा अपडेट नहीं किए जाने तक कार्य न करें."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"स्थानीय टर्मिनल"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"स्थानीय शेल एक्सेस ऑफ़र करने वाला टर्मिनल एप्लिकेशन सक्षम करें"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"गैजेट चुनें"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"विजेट चुनें"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"विजेट बनाएं और पहुंच की अनुमति दें?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"सेवाएं"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"सिस्‍टम"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"आवर्धन जेस्चर"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"इस सुविधा के चालू होने पर, आप स्क्रीन को तीन बार टैप करके ज़ूम इन और आउट कर सकते हैं."\n\n"ज़ूम इन होने पर, आप निम्न कार्य कर सकते हैं:"\n<ul><li>"पैन करना: स्क्रीन पर दो या अधिक अंगुलियों को खींचें."</li>\n<li>"ज़ूम स्तर एडजस्ट करना: दो या अधिक अंगुलियों को साथ में पिंच करें या उन्हें दूर फैलाएं."</li></ul>\n\n"आप तीन बार टैप करके और टैप किया हुआ रखकर, अपनी अंगुलियों के नीचे की सामग्री को अस्थायी रूप से आवर्धित भी कर सकते हैं. इस आवर्धित स्थिति में, आप स्क्रीन के विभिन्न भागों को एक्सप्लोर करने के लिए अपनी अंगुलियों को खींच सकते हैं. अपनी पूर्व स्थिति में पहुंचने के लिए अपनी अंगुली को उठाएं."\n\n"ध्यान दें: आवर्धन कार्यों के लिए कीबोर्ड और नेविगेशन बार को छोड़कर कहीं भी तीन बार टैप करें."</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_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>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack नेत्रहीन और कम-दृष्टि वाले उपयोगकर्ताओं के लिए बोलकर फ़ीडबैक प्रदान करता है. क्‍या आप इसे Android Market से निशुल्‍क इंस्‍टॉल करना चाहते हैं?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"कोई विवरण नहीं दिया गया."</string>
     <string name="settings_button" msgid="3006713718908152930">"सेटिंग"</string>
+    <string name="print_settings" msgid="4742428530112487843">"प्रिंटिंग"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"प्रिंटिंग सेटिंग"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"सेवाएं"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> का उपयोग करें?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> आपके द्वारा प्रिंट किए जाने वाले दस्तावेज़ों को प्राप्त कर सकती है. ऐसे दस्तावेज़ों में संवेदनशील डेटा हो सकता है."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"कोई सेवा इंस्‍टॉल नहीं है"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"सेटिंग"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"प्रिंटर जोड़ें"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"चालू"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"बंद"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"बैटरी"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"बैटरी का उपयोग कौन कर रहा है"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"बैटरी उपयोग डेटा उपलब्ध नहीं है."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi चल रहा है"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"टेबलेट"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"फ़ोन"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"डेटा भेजा गया"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"डेटा प्राप्त"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"मोबाइल डेटा भेजा गया"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"मोबाइल डेटा प्राप्त हुआ"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Wi‑Fi डेटा भेजा गया"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Wi‑Fi डेटा प्राप्त हुआ"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"ऑडियो"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"वीडियो"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"चालू करने का समय"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"पिच"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"बोले गए पाठ के लहजे को प्रभावित करता है"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"भाषा"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"भाषा नहीं चुनी गई है"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"बोले गए पाठ के लिए भाषा-विशिष्ट ध्‍वनि सेट करता है"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"एक उदाहरण सुनें"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"वाक् संश्लेषण का एक संक्षिप्त प्रदर्शन चलाएं"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP समर्थित नहीं है."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"आप सेटअप के दौरान किसी EAP Wi-Fi कनेक्‍शन को कॉन्‍िफ़गर नहीं कर सकते. सेटअप करने के बाद, आप उसे सेटिंग &gt; वायरलेस और नेटवर्क में कॉन्फ़िगर कर सकते हैं."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"कनेक्‍ट होने में कुछ मिनट लग सकते हैं..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"सेटअप जारी रखने के लिए "<b>"अगला"</b>" स्पर्श करें."\n\n"किसी भिन्न Wi‑Fi नेटवर्क से कनेक्ट करने के लिए "<b>"वापस जाएं"</b>" स्पर्श करें."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"सेटअप जारी रखने के लिए "<b>"अगला"</b>" स्पर्श करें.\n\nकिसी भिन्न Wi‑Fi नेटवर्क से कनेक्ट करने के लिए "<b>"वापस जाएं"</b>" स्पर्श करें."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"समन्वयन सक्षम"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"समन्वयन अक्षम"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"समन्वयन त्रुटि."</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"GPU ओवरड्रॉ डीबग करें"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW ओवरले अक्षम करें"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"स्‍क्रीन संयोजन के लिए हमेशा GPU का उपयोग करें"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL चिह्न सक्षम करें"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"मो. नेटवर्क पर पृष्ठभूमि डेटा अक्षम करें. उपलब्ध होने पर गैर-मो. नेटवर्क का उपयोग होगा."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"इस एप्‍लि. के लिए पृष्ठभूमि डेटा प्रतिबंधित करने हेतु, पहले मो. डेटा सीमा सेट करें."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"पृष्ठभूमि डेटा प्रतिबंधित करें?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"यह सुविधा केवल मोबाइल नेटवर्क उपलब्ध होने पर उस एप्ल‍िकेशन को कार्य करने से रोक सकती है जो पृष्ठभूमि डेटा पर निर्भर है."\n\n"आपको एप्ल‍िकेशन में उपलब्ध सेटिंग में अधिक उपयुक्त डेटा उपयोग नियंत्रण मिल सकते हैं."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"यह सुविधा केवल मोबाइल नेटवर्क उपलब्ध होने पर उस एप्ल‍िकेशन को कार्य करने से रोक सकती है जो पृष्ठभूमि डेटा पर निर्भर है.\n\nआपको एप्ल‍िकेशन में उपलब्ध सेटिंग में अधिक उपयुक्त डेटा उपयोग नियंत्रण मिल सकते हैं."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"पृष्ठभूमि डेटा प्रतिबंधित करना केवल तभी संभव है जब आपने कोई नेटवर्क डेटा सीमा सेट की हुई हो."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"स्वत: समन्वयन डेटा चालु करें?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"वेब पर आपके खातों में कोई भी परिवर्तन करने पर आपके टेबलेट में उसकी प्रतिलिपि स्‍वत: बन जाएगी."\n\n"उसी प्रकार वेब पर टेबलेट में आपके द्वारा कोई भी परिवर्तन करने पर कुछ खाते उसकी प्रतिलिपि स्‍वत: बना सकते हैं. एक Google खाता इसी प्रकार कार्य करता है."\n\n"चयन करने के लिए कि प्रत्‍येक खाते के अन्तर्गत किस प्रकार की जानकारीयां समन्‍वयित करना है, सेटिंग &gt; खाते पर जाएं."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"वेब पर आपके खातों में कोई भी परिवर्तन करने पर आपके फ़ोन में उसकी प्रतिलिपि स्‍वत: बन जाएगी."\n\n"उसी प्रकार वेब पर फ़ोन में आपके द्वारा कोई भी परिवर्तन होने पर कुछ खाते उसकी प्रतिलिपि स्‍वत: बना सकते हैं. एक Google खाता इसी प्रकार कार्य करता है."\n\n"चयन करने के लिए कि प्रत्‍येक खाते के अन्तर्गत किस प्रकार की जानकारीयां समन्‍वयित करना है, सेटिंग &gt; खाते पर जाएं."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"वेब पर आपके खातों में कोई भी परिवर्तन करने पर आपके टेबलेट में उसकी प्रतिलिपि स्‍वत: बन जाएगी.\n\nउसी प्रकार वेब पर टेबलेट में आपके द्वारा कोई भी परिवर्तन करने पर कुछ खाते उसकी प्रतिलिपि स्‍वत: बना सकते हैं. एक Google खाता इसी प्रकार कार्य करता है.\n\nचयन करने के लिए कि प्रत्‍येक खाते के अन्तर्गत किस प्रकार की जानकारीयां समन्‍वयित करना है, सेटिंग &gt; खाते पर जाएं."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"वेब पर आपके खातों में कोई भी परिवर्तन करने पर आपके फ़ोन में उसकी प्रतिलिपि स्‍वत: बन जाएगी.\n\nउसी प्रकार वेब पर फ़ोन में आपके द्वारा कोई भी परिवर्तन होने पर कुछ खाते उसकी प्रतिलिपि स्‍वत: बना सकते हैं. एक Google खाता इसी प्रकार कार्य करता है.\n\nचयन करने के लिए कि प्रत्‍येक खाते के अन्तर्गत किस प्रकार की जानकारीयां समन्‍वयित करना है, सेटिंग &gt; खाते पर जाएं."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"स्वत: समन्वयन डेटा बंद करें?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"यह डेटा और बैटरी उपयोग को संरक्षित करेगा, किन्‍तु हाल की जानकारी एकत्रित करने के लिए आपको प्रत्‍येक खाते का समन्‍वयन मैन्‍युअल रूप से करना होगा. और जब अपडेट होंगे तो आपको सूचनाएं प्राप्‍त नहीं होगी."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"उपयोग चक्र रीसेट दिनांक"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"डेटा उपयोग चेतावनी सेट करें"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"डेटा उपयोग की सीमा सेट करें"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"डेटा उपयोग सीमित करना"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"निर्दिष्ट सीमा तक पहुंचने पर आपका डेटा कनेक्‍शन अक्षम हो जाएगा."\n\n"चूंकि डेटा उपयोग को आपके टेबलेट द्वारा मापा जाता है, और आपका कैरियर उपयोग के लिए भिन्‍न तरह से शुल्क ले सकता है, इसलिए सीमित उपयोग पर विचार करें."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"निर्दिष्ट सीमा तक पहुंचने पर आपका डेटा कनेक्‍शन अक्षम हो जाएगा."\n\n"चूंकि डेटा उपयोग को आपके फ़ोन द्वारा मापा जाता है, और आपका कैरियर उपयोग के लिए भिन्‍न तरह से शुल्क ले सकता है, इसलिए सीमित उपयोग पर विचार करें."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"निर्दिष्ट सीमा तक पहुंचने पर आपका डेटा कनेक्‍शन अक्षम हो जाएगा.\n\nचूंकि डेटा उपयोग को आपके टेबलेट द्वारा मापा जाता है, और आपका कैरियर उपयोग के लिए भिन्‍न तरह से शुल्क ले सकता है, इसलिए सीमित उपयोग पर विचार करें."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"निर्दिष्ट सीमा तक पहुंचने पर आपका डेटा कनेक्‍शन अक्षम हो जाएगा.\n\nचूंकि डेटा उपयोग को आपके फ़ोन द्वारा मापा जाता है, और आपका कैरियर उपयोग के लिए भिन्‍न तरह से शुल्क ले सकता है, इसलिए सीमित उपयोग पर विचार करें."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"पृष्ठभूमि डेटा प्रतिबंधित करें?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"यदि आप पृष्ठभूमि मोबाइल डेटा को प्रतिबंधित करते हैं, तो जब तक आप Wi-Fi नेटवर्क से कनेक्ट नहीं होते, तब तक कुछ एप्लिकेशन और सेवाएं काम नहीं करेंगी."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"यदि आप पृष्ठभूमि मोबाइल डेटा को प्रतिबंधित करते हैं, तो जब तक आप Wi-Fi नेटवर्क से कनेक्ट नहीं होते, तब तक कुछ एप्लिकेशन और सेवाएं काम नहीं करेंगी.."\n\n"यह सेटिंग इस टेबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"यदि आप पृष्ठभूमि मोबाइल डेटा को प्रतिबंधित करते हैं, तो जब तक आप Wi-Fi नेटवर्क से कनेक्ट नहीं होते, तब तक कुछ एप्लिकेशन और सेवाएं काम नहीं करेंगी."\n\n"यह सेटिंग इस फ़ोन के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"यदि आप पृष्ठभूमि मोबाइल डेटा को प्रतिबंधित करते हैं, तो जब तक आप Wi-Fi नेटवर्क से कनेक्ट नहीं होते, तब तक कुछ एप्लिकेशन और सेवाएं काम नहीं करेंगी..\n\nयह सेटिंग इस टेबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"यदि आप पृष्ठभूमि मोबाइल डेटा को प्रतिबंधित करते हैं, तो जब तक आप Wi-Fi नेटवर्क से कनेक्ट नहीं होते, तब तक कुछ एप्लिकेशन और सेवाएं काम नहीं करेंगी.\n\nयह सेटिंग इस फ़ोन के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"चेतावनी"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"सीमा"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"निकाले गए एप्लिकेशन"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"उपयोगकर्ता"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"प्रतिबंधित प्रोफ़ाइल"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"नया उपयोगकर्ता जोड़ें"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"आप अतिरिक्त उपयोगकर्ता बनाकर इस उपकरण को अन्य लोगों से साझा कर सकते हैं. प्रत्येक उपयोगकर्ता के पास अपना स्वयं का स्थान होता है, जिसे वह अपने एप्लिकेशन, वॉलपेपर, और ऐसी ही अन्य चीज़ों के साथ कस्टमाइज़ कर सकता है. उपयोगकर्ता Wi-Fi जैसी अन्य टेबलेट सेटिंग भी एडजस्ट कर सकते हैं जो सभी को प्रभावित करती है."\n\n"आपके द्वारा नया उपयोगकर्ता बनाने के बाद, उस व्यक्ति को सेटअप प्रक्रिया से गुज़रना आवश्यक है."\n\n"कोई भी उपयोगकर्ता अन्य सभी उपयोगकर्ताओं की ओर से अपडेट की गई एप्लिकेशन अनुमतियां स्वीकार कर सकता है."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"आपके द्वारा नया उपयोगकर्ता बनाने के बाद, उस व्यक्ति को सेटअप प्रक्रिया से गुज़रना आवश्यक है."\n\n"कोई भी उपयोगकर्ता अन्य सभी उपयोगकर्ताओं की ओर से अपडेट की गई एप्लिकेशन अनुमतियां स्वीकार कर सकता है."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"आप अतिरिक्त उपयोगकर्ता बनाकर इस उपकरण को अन्य लोगों से साझा कर सकते हैं. प्रत्येक उपयोगकर्ता के पास अपना स्वयं का स्थान होता है, जिसे वह अपने एप्लिकेशन, वॉलपेपर, और ऐसी ही अन्य चीज़ों के साथ कस्टमाइज़ कर सकता है. उपयोगकर्ता Wi-Fi जैसी अन्य टेबलेट सेटिंग भी एडजस्ट कर सकते हैं जो सभी को प्रभावित करती है.\n\nआपके द्वारा नया उपयोगकर्ता बनाने के बाद, उस व्यक्ति को सेटअप प्रक्रिया से गुज़रना आवश्यक है.\n\nकोई भी उपयोगकर्ता अन्य सभी उपयोगकर्ताओं की ओर से अपडेट की गई एप्लिकेशन अनुमतियां स्वीकार कर सकता है."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"आपके द्वारा नया उपयोगकर्ता बनाने के बाद, उस व्यक्ति को सेटअप प्रक्रिया से गुज़रना आवश्यक है.\n\nकोई भी उपयोगकर्ता अन्य सभी उपयोगकर्ताओं की ओर से अपडेट की गई एप्लिकेशन अनुमतियां स्वीकार कर सकता है."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"उपयोगकर्ता को अभी सेट करें?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"सुनिश्चित करें कि व्यक्ति टेबलेट लेने और अपना स्थान सेट करने के लिए उपलब्ध है"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"प्रोफ़ाइल अभी सेट करें?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"यह सेटिंग इस फ़ोन के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"भाषा बदलें"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"फ़ॉन्ट आकार बदलें"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"प्रतिबंध"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"प्रतिबंधों को निकालें"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"पिन बदलें"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"सूचना दिखाएं"</string>
     <string name="help_label" msgid="1107174367904110532">"सहायता"</string>
     <string name="user_account_title" msgid="1127193807312271167">"सामग्री के लिए खाता"</string>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 0335e8cc468..6ef5fdce200 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Lokacija"</item>
     <item msgid="255608127647030286">"Osobno"</item>
     <item msgid="4588829735729884491">"Slanje poruka"</item>
-    <item msgid="8971765125227378270">"Uređaj"</item>
+    <item msgid="886742181977884584">"Mediji"</item>
+    <item msgid="7924928667052300589">"Uređaj"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"približna lokacija"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"reprodukcija audiozapisa"</item>
     <item msgid="8374996688066472414">"čitaj međuspremnik"</item>
     <item msgid="3045529469061083747">"izmijeni međuspremnik"</item>
+    <item msgid="5124443975763747838">"medijski gumbi"</item>
+    <item msgid="4547883971364273343">"audiofokus"</item>
+    <item msgid="2603878814882344450">"glavna glasnoća"</item>
+    <item msgid="7136963238377062018">"glasnoća glasa"</item>
+    <item msgid="4270236897655923007">"glasnoća zvona"</item>
+    <item msgid="6325739889222559394">"glasnoća medija"</item>
+    <item msgid="5762123934816216821">"glasnoća alarma"</item>
+    <item msgid="785049718065337473">"glasnoća obavijesti"</item>
+    <item msgid="6700305533746877052">"glasnoća Bluetootha"</item>
+    <item msgid="2029227495214047094">"zadrži u aktivnom stanju"</item>
+    <item msgid="26109888160231211">"praćenje lokacije"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokacija"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Reprodukcija audiozapisa"</item>
     <item msgid="136815868796597058">"Čitaj međuspremnik"</item>
     <item msgid="5238692940326972503">"Izmijeni međuspremnik"</item>
+    <item msgid="5753789168376302997">"Medijski gumbi"</item>
+    <item msgid="3265262911688671938">"Audiofokus"</item>
+    <item msgid="2098976479485046797">"Glavna glasnoća"</item>
+    <item msgid="5660213838861789350">"Glasnoća glasa"</item>
+    <item msgid="7983336752371254444">"Glasnoća zvona"</item>
+    <item msgid="7878027809189330917">"Glasnoća medija"</item>
+    <item msgid="7260546305036218513">"Glasnoća alarma"</item>
+    <item msgid="9103719301075748925">"Glasnoća obavijesti"</item>
+    <item msgid="7025966722295861512">"Glasnoća Bluetootha"</item>
+    <item msgid="4665183401128289653">"Zadrži u aktivnom stanju"</item>
+    <item msgid="8584357129746649222">"Lokacija"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kratko"</item>
     <item msgid="2560532955514699713">"Srednje"</item>
     <item msgid="2372711992605524591">"Dugo"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (uklanjanje program. pogrešaka)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Upotrijebi Dalvik"</item>
+    <item msgid="5131846588686178907">"Upotrijebi ART"</item>
+    <item msgid="4530003713865319928">"Upotrijebi verziju ART-a za uklanjanje programskih pogrešaka"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nikad ne provjeravaj"</item>
     <item msgid="6042769699089883931">"Provjeri samo DRM sadržaj"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Na zaslonu u obliku crta"</item>
     <item msgid="120512413928262547">"U naredbi adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Isključeno"</item>
+    <item msgid="7688197031296835369">"Pokaži područja slojnih iscrtavanja"</item>
+    <item msgid="8332661909019981149">"Pokaži brojač slojnih iscrtavanja"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardna granica"</item>
     <item msgid="4071574792028999443">"Nema pozadinskih procesa"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 2ca8e96eaae..336d73c7de0 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Kada dopustite podatkovni roaming, mogu nastati značajni troškovi roaminga!\n\nOva postavka utječe na sve korisnike na ovom tabletu."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Kada dopustite podatkovni roaming, mogu nastati značajni troškovi roaminga!\n\nOva postavka utječe na sve korisnike na ovom telefonu."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Dopusti roaming podataka?"</string>
     <string name="networks" msgid="6333316876545927039">"Odabir operatora"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Odaberite mrežnog operatera"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Traži brojčani PIN ili zaporku za dekripciju tablet računala svaki put kada se uključi"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Traži brojčani PIN ili zaporku za dekripciju telefona svaki put kada se uključi"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Kriptirano"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Možete kriptirati svoje račune, postavke, preuzete aplikacije i njihove podatkovne, multimedijske i ostale datoteke. Nakon kriptiranja tabletnog računala morate upisati numerički PIN ili zaporku kako biste ga dešifrirali svaki put kada ga uključite: svoje tabletno računalo možete dešifrirati samo vraćanjem u tvorničko stanje čime se brišu svi vaši podaci."\n\n"Enkripcija traje jedan sat ili dulje. Morate započeti s napunjenom baterijom i tabletno računalo držati priključeno dok se enkripcija ne završi. Ako prekinete postupak enkripcije, izgubit ćete neke ili sve svoje podatke."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Možete kriptirati svoje račune, postavke, preuzete aplikacije i njihove podatkovne, multimedijske i ostale datoteke. Nakon kriptiranja telefona morate upisati numerički PIN ili zaporku kako biste ga dešifrirali svaki put kada ga uključite. Svoj telefon možete dešifrirati samo vraćanjem na tvorničke postavke čime se brišu svi vaši podaci."\n\n"Enkripcija traje jedan sat ili dulje. Morate započeti s napunjenom baterijom i telefon držati priključen dok se enkripcija ne završi. Ako prekinete postupak enkripcije, izgubit ćete neke ili sve svoje podatke."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Možete kriptirati svoje račune, postavke, preuzete aplikacije i njihove podatkovne, multimedijske i ostale datoteke. Nakon kriptiranja tabletnog računala morate upisati numerički PIN ili zaporku kako biste ga dešifrirali svaki put kada ga uključite: svoje tabletno računalo možete dešifrirati samo vraćanjem u tvorničko stanje čime se brišu svi vaši podaci.\n\nEnkripcija traje jedan sat ili dulje. Morate započeti s napunjenom baterijom i tabletno računalo držati priključeno dok se enkripcija ne završi. Ako prekinete postupak enkripcije, izgubit ćete neke ili sve svoje podatke."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Možete kriptirati svoje račune, postavke, preuzete aplikacije i njihove podatkovne, multimedijske i ostale datoteke. Nakon kriptiranja telefona morate upisati numerički PIN ili zaporku kako biste ga dešifrirali svaki put kada ga uključite. Svoj telefon možete dešifrirati samo vraćanjem na tvorničke postavke čime se brišu svi vaši podaci.\n\nEnkripcija traje jedan sat ili dulje. Morate započeti s napunjenom baterijom i telefon držati priključen dok se enkripcija ne završi. Ako prekinete postupak enkripcije, izgubit ćete neke ili sve svoje podatke."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Kriptiraj tablet uređaj"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Kriptiraj telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Napunite bateriju i pokušajte ponovo."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Pokušajte ponovo za <xliff:g id="DELAY">^1</xliff:g> s."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Unesite svoju zaporku"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripcija neuspješna"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Enkripcija je prekinuta i ne može se dovršiti. Podaci na vašem tabletnom računali zbog toga više nisu dostupni."\n\n"Da biste nastavili upotrebljavati svoje tabletno računalo, trebate provesti vraćanje u tvorničko stanje. Prilikom postavljanja tabletnog računala nakon vraćanja u tvorničko stanje imat ćete priliku vratiti sve podatke za koje ste na Google računu izradili sigurnosnu kopiju."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Enkripcija je prekinuta i ne može se dovršiti. Stoga podaci na vašem telefonu više nisu dostupni. "\n\n"Da biste nastavili upotrebljavati ​​telefon, morate vratiti tvorničke postavke. Kada nakon toga postavite svoj telefon, imat ćete priliku vratiti sve podatke čije su sigurnosne kopije stvorene na vašem Google računu."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Enkripcija je prekinuta i ne može se dovršiti. Podaci na vašem tabletnom računali zbog toga više nisu dostupni.\n\nDa biste nastavili upotrebljavati svoje tabletno računalo, trebate provesti vraćanje u tvorničko stanje. Prilikom postavljanja tabletnog računala nakon vraćanja u tvorničko stanje imat ćete priliku vratiti sve podatke za koje ste na Google računu izradili sigurnosnu kopiju."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Enkripcija je prekinuta i ne može se dovršiti. Stoga podaci na vašem telefonu više nisu dostupni. \n\nDa biste nastavili upotrebljavati ​​telefon, morate vratiti tvorničke postavke. Kada nakon toga postavite svoj telefon, imat ćete priliku vratiti sve podatke čije su sigurnosne kopije stvorene na vašem Google računu."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Promjena načina unosa"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Odaberite zaključavanje zaslona"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Odabir sig. zaključ."</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Povezivanje"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Povezan"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Dostupan"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"U upotrebi"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Postavke zaslona"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Isključiti?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"To će prekinuti vašu vezu s uređajem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Isključeno"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nije dostupno jer je NFC isključen"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Kada je ta značajka uključena, možete emitirati sadržaj aplikacije na drugi uređaj na kojem je omogućen NFC tako da držite uređaje jedan uz drugi. Na primjer, možete emitirati stranice Preglednika, videozapise s YouTubea, kontakte s Osoba i više."\n\n"Jednostavno približite jedan uređaj drugom (obično se njihove stražnje strane prislanjaju jedna uz drugu), a zatim dodirnite zaslon. Aplikacija određuje što će se emitirati."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Kada je ta značajka uključena, možete emitirati sadržaj aplikacije na drugi uređaj na kojem je omogućen NFC tako da držite uređaje jedan uz drugi. Na primjer, možete emitirati stranice Preglednika, videozapise s YouTubea, kontakte s Osoba i više.\n\nJednostavno približite jedan uređaj drugom (obično se njihove stražnje strane prislanjaju jedna uz drugu), a zatim dodirnite zaslon. Aplikacija određuje što će se emitirati."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Otkrivanje mrežne usluge"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Dopusti aplikacijama na drugim uređajima otkrivanje aplikacija na ovom uređaju"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Osigurano značajkom <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", osigurano značajkom <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nema"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Radi poboljšanja preciznosti lokacije kao i u druge svrhe aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti pregledavanje mreže, čak i kada je Wi-Fi isključen."\n\n"Želite li to dozvoliti za sve aplikacije koje žele izvoditi pregledavanje?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Radi poboljšanja preciznosti lokacije kao i u druge svrhe aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti pregledavanje mreže, čak i kada je Wi-Fi isključen.\n\nŽelite li to dozvoliti za sve aplikacije koje žele izvoditi pregledavanje?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Dopusti"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Odbij"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Poveži"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"UPOZORENJE: mogući su dodatni troškovi za promet podataka.\n\nZa postavljanje tabletnog računala može biti potrebna značajna mrežna aktivnost."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"UPOZORENJE: mogući su dodatni troškovi za promet podataka.\n\nZa postavljanje telefona može biti potrebna značajna mrežna aktivnost."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"UPOZORENJE: dok ne uspostavite vezu s internetom, tabletno računalo neće moći potvrditi da je vaš softver ažuran."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"UPOZORENJE: dok ne uspostavite vezu s internetom, telefon neće moći potvrditi da je vaš softver ažuran."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tabletno računalo nije se moglo povezati s ovom Wi-Fi mrežom."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Netočan PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN-ovi se ne podudaraju"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Nije moguće promijeniti PIN."\n"PIN je možda netočan."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Nije moguće promijeniti PIN.\nPIN je možda netočan."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Uspješno je promijenjen PIN SIM-a"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Nije moguće promijeniti stanje zaključanosti SIM kartice."\n"Možda je PIN pogrešan."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Nije moguće promijeniti stanje zaključanosti SIM kartice.\nMožda je PIN pogrešan."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"U redu"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Odustani"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status tabletnog uređaja"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Vraćanje na tvorničko stanje"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Briše sve podatke na tabletnom uređaju"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Izbriši sve podatke na telefonu"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" tabletnog računala, uključujući:"\n\n<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" telefona, uključujući:"\n\n<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutačno ste prijavljeni na sljedeće račune:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" tabletnog računala, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"To će izbrisati sve podatke s "<b>"unutarnje pohrane"</b>" telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutačno ste prijavljeni na sljedeće račune:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Glazba"</li>\n<li>"Fotografije"</li>\n<li>"Ostali korisnički podaci"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, "<b>"USB pohrana"</b>" treba biti izbrisana."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, trebate izbrisati "<b>"SD karticu"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Prikaži procese iz predmemorije"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Poništi postavke"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Poništiti postavke?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"To će poništiti sve postavke za:"\n\n" "<li>"onemogućene aplikacije"</li>\n" "<li>"onemogućene obavijesti aplikacija"</li>\n" "<li>"zadane aplikacije za radnje"</li>\n" "<li>"ograničenja pozadinskih podataka za aplikacije"</li>\n\n" Nećete izgubiti podatke iz aplikacija."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"To će poništiti sve postavke za:\n\n "<li>"onemogućene aplikacije"</li>\n" "<li>"onemogućene obavijesti aplikacija"</li>\n" "<li>"zadane aplikacije za radnje"</li>\n" "<li>"ograničenja pozadinskih podataka za aplikacije"</li>\n\n" Nećete izgubiti podatke iz aplikacija."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Poništi aplikacije"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostorom"</string>
     <string name="filter" msgid="2018011724373033887">"Filtar"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Za prijelaz pritisnite Ctrl i razmaknicu."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Zadano"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Izgledi tipkovnice"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Korisnički rječnik"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Osobni rječnik"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Osobni rječnici"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Osobni rječnik"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Dodaj"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Dodaj u rječnik"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"U izbornik napajanja uključi opciju za izradu izvješća o bugovima"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Ne pokreći mirovanje"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Zaslon nikad neće prijeći u mirovanje tijekom punjenja"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Omogući zapisnik naredbe \"snoop\" za Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Snimi sve Bluetooth HCI pakete u datoteci"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Odabir vremena izvođenja"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Odabir vremena izvođenja"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Želite li pokrenuti ponovo da biste promijenili vrijeme izvođenja s <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Dopusti probne lokacije"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Dopusti probne lokacije"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Omogućiti rješavanje programske pogreške na USB-u?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Zaštiti USB pohranu"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplikacije moraju tražiti dozvolu za čitanje USB pohrane"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Zaštititi USB pohranu?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Kad je USB pohrana zaštićena, aplikacije moraju tražiti dozvolu za čitanje podataka s vanjske pohrane."\n\n"Neke aplikacije možda neće raditi dok ih razvojni programeri ne ažuriraju."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Kad je USB pohrana zaštićena, aplikacije moraju tražiti dozvolu za čitanje podataka s vanjske pohrane.\n\nNeke aplikacije možda neće raditi dok ih razvojni programeri ne ažuriraju."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Zaštiti SD karticu"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikacije moraju tražiti dozvolu za čitanje SD kartice"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Zaštititi SD karticu?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Kad je SD kartica zaštićena, aplikacije moraju tražiti dozvolu za čitanje podataka s vanjske pohrane."\n\n"Neke aplikacije možda neće raditi dok ih razvojni programeri ne ažuriraju."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Kad je SD kartica zaštićena, aplikacije moraju tražiti dozvolu za čitanje podataka s vanjske pohrane.\n\nNeke aplikacije možda neće raditi dok ih razvojni programeri ne ažuriraju."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokalni terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Omogući aplikaciju terminala koja nudi pristup lokalnoj ovojnici"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Odaberi gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Odaberite widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Želite izraditi widget i dozvoliti pristup?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Usluge"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sustav"</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_screen_magnification_summary" msgid="2380627654189671754">"Ako je ova značajka uključena, možete povećati ili smanjiti prikaz ako triput dodirnete zaslon.\n\nNakon povećanja prikaza možete sljedeće:\n"<ul><li>"Pomicati: pomoću dva prsta ili više prstiju povlačite prikaz na zaslonu."</li>\n<li>"Podesiti razinu zumiranja: stisnite dva prsta ili više prstiju ili ih raširite."</li></ul>\n\n"Također možete privremeno povećati stavku ispod prsta ako je triput dodirnete i držite. U tom slučaju možete povlačiti prst kako biste istražili različite dijelove zaslona. Podignite prst kako biste se vratili na prijašnje stanje.\n\nNapomena: povećanje trostrukim dodirom moguće je svuda osim na tipkovnici i traci za navigaciju."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Prečac pristupačnosti"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Uključeno"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Isključeno"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kada je ova značajka uključena, možete brzo omogućiti značajke pristupačnosti u dva koraka:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Kada je ova značajka uključena, možete brzo omogućiti značajke pristupačnosti u dva koraka:\n\n1. korak: pritisnite i držite gumb za uključivanje/isključivanje dok ne začujete zvuk ili osjetite vibraciju.\n\n2. korak: dodirnite i držite s dva prsta dok ne začujete zvučnu potvrdu.\n\nAko uređaj ima više korisnika, ovaj prečac na zaključanom zaslonu omogućuje pristupačnost dok se uređaj ne otključa."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Veliki tekst"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Uvećanje zaslona"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Autom. ažuriranje uvećanja zaslona"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack daje govorne povratne informacije kao pomoć slijepim i slabovidnim korisnicima. Želite li ga besplatno instalirati s usluge Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nije dan opis."</string>
     <string name="settings_button" msgid="3006713718908152930">"Postavke"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Ispis"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Postavke ispisa"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Usluge"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Želite li upotrijebiti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> može primati dokumente koje ispisujete. Takvi dokumenti mogu sadržavati osjetljive podatke."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Nema instaliranih usluga"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Postavke"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Dodavanje pisača"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Uključeno"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Isključeno"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterija"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Što troši bateriju"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Podaci o iskorištenosti baterije nisu dostupni."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi se izvodi"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tabletni uređaj"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Podaci poslani"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Primljeni podaci"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Poslani mobilni podaci"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Primljeni mobilni podaci"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Poslani Wi‑Fi podaci"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Primljeni Wi‑Fi podaci"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Videozapis"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Vrijeme uključenosti"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Visina glasa"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Utječe na ton izgovorenog teksta"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Jezik"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Jezik nije odabran"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Postavlja jezik govora"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Poslušajte primjer"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Poslušajte primjer sinteze zvuka"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP nije podržan."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Ne možete konfigurirati EAP Wi-Fi vezu tijekom postavljanja. To možete učiniti nakon postavljanja u Postavkama pod stavkom Bežično povezivanje i mreže."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Povezivanje može potrajati nekoliko minuta..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Dodirnite "<b>"Dalje"</b>" za nastavak postavljanja."\n\n"Dodirnite "<b>"Natrag"</b>" za povezivanje s nekom drugom Wi-Fi mrežom."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Dodirnite "<b>"Dalje"</b>" za nastavak postavljanja.\n\nDodirnite "<b>"Natrag"</b>" za povezivanje s nekom drugom Wi-Fi mrežom."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinkronizacija je omogućena"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Onemogućena je sinkronizacija"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Pogreška sinkronizacije"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Ukl. pogr. GPU sl. iscrt."</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Onemogući HW preklapanja"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Uvijek upotrijebi GPU kod slaganja zaslona"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Omogući OpenGL praćenja"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Onemogući pozadinske podatke na mobilnim mrežama. Upotrijebit će se fiksne mreže ako su dostupne."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Za ograničenje poz. podat. za ovu apl. ograničite mob. podatke."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Ograničenje pozadinskih podataka?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Zbog te značajke aplikacija koja ovisi o pozadinskim podacima može prestati raditi kada su dostupne samo mobilne mreže."\n\n"U postavkama možete pronaći prikladnije kontrole prijenosa podataka."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Zbog te značajke aplikacija koja ovisi o pozadinskim podacima može prestati raditi kada su dostupne samo mobilne mreže.\n\nU postavkama možete pronaći prikladnije kontrole prijenosa podataka."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Ograničavanje pozadinskih podataka moguće je samo ako ste postavili ograničenje mobilnih podataka."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Uključiti auto. sinkronizaciju?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Sve promjene koje napravite na svojim računima na webu automatski će se kopirati na vaš tablet."\n\n"Neki računi također mogu automatski kopirati na web sve promjene koje napravite na tabletu. Tako funkcionira Google račun."\n\n"Da biste odabrali vrstu podataka koji će se za pojedini račun sinkronizirati, idite na Postavke &gt; Računi."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Sve promjene koje napravite na svojim računima na webu automatski će se kopirati na vaš telefon."\n\n"Neki računi također mogu automatski kopirati na web sve promjene koje napravite na telefonu. Tako funkcionira Google račun."\n\n"Da biste odabrali vrstu podataka koji će se za pojedini račun sinkronizirati, idite na Postavke &gt; Računi."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Sve promjene koje napravite na svojim računima na webu automatski će se kopirati na vaš tablet.\n\nNeki računi također mogu automatski kopirati na web sve promjene koje napravite na tabletu. Tako funkcionira Google račun.\n\nDa biste odabrali vrstu podataka koji će se za pojedini račun sinkronizirati, idite na Postavke &gt; Računi."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Sve promjene koje napravite na svojim računima na webu automatski će se kopirati na vaš telefon.\n\nNeki računi također mogu automatski kopirati na web sve promjene koje napravite na telefonu. Tako funkcionira Google račun.\n\nDa biste odabrali vrstu podataka koji će se za pojedini račun sinkronizirati, idite na Postavke &gt; Računi."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Isključiti auto. sinkronizaciju?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Time će se uštedjeti promet podataka i potrošnja baterije, ali svaki ćete račun morati ručno sinkronizirati kako biste dobili najnovije informacije. Nećete primati obavijesti o ažuriranjima."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum poništavanja ciklusa upotrebe"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Postavite upozorenje o upotrebi podataka"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Postavite ograničenje upotrebe podataka"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograničavanje upotrebe podataka"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Vaša podatkovna veza mobilnog uređaja bit će onemogućena kada dosegnete navedeno ograničenje."\n\n"Budući da potrošnju podataka mjeri vaše tabletno računalo, a vaš mobilni operater možda obračunava na neki drugi način, razmislite o postavljanju opreznijeg ograničenja."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Vaša podatkovna veza mobilnog uređaja bit će onemogućena kada dosegnete navedeno ograničenje."\n\n"Budući da potrošnju podataka mjeri vaš telefon, a vaš mobilni operater možda obračunava na neki drugi način, razmislite o postavljanju opreznijeg ograničenja."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Vaša podatkovna veza mobilnog uređaja bit će onemogućena kada dosegnete navedeno ograničenje.\n\nBudući da potrošnju podataka mjeri vaše tabletno računalo, a vaš mobilni operater možda obračunava na neki drugi način, razmislite o postavljanju opreznijeg ograničenja."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Vaša podatkovna veza mobilnog uređaja bit će onemogućena kada dosegnete navedeno ograničenje.\n\nBudući da potrošnju podataka mjeri vaš telefon, a vaš mobilni operater možda obračunava na neki drugi način, razmislite o postavljanju opreznijeg ograničenja."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Ograničenje pozadinskih podataka?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge neće raditi ako niste povezani s Wi-Fi mrežom."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge neće raditi ako niste povezani s Wi-Fi mrežom."\n\n"Ova postavka utječe na sve korisnike na ovom tabletnom računalu."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge neće raditi ako niste povezani s Wi-Fi mrežom."\n\n"Ova postavka utječe na sve korisnike na ovom telefonu."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge neće raditi ako niste povezani s Wi-Fi mrežom.\n\nOva postavka utječe na sve korisnike na ovom tabletnom računalu."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge neće raditi ako niste povezani s Wi-Fi mrežom.\n\nOva postavka utječe na sve korisnike na ovom telefonu."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"Upozorenja: <xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12"></font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ograničenje"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Uklonjene aplikacije"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Korisnik"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ograničeni profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Dodaj novog korisnika"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Ovaj uređaj možete dijeliti s drugima tako da stvorite dodatne korisnike. Svaki korisnik ima vlastiti prostor koji može prilagoditi sa svojim aplikacijama, pozadinskom slikom i sličnim stvarima. Korisnici također mogu podesiti postavke tabletnog računala, primjerice Wi-Fi, koje utječu na sve."\n\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_add_user_message_long" msgid="3086244205384741788">"Ovaj uređaj možete dijeliti s drugima tako da stvorite dodatne korisnike. Svaki korisnik ima vlastiti prostor koji može prilagoditi sa svojim aplikacijama, pozadinskom slikom i sličnim stvarima. Korisnici također mogu podesiti postavke tabletnog računala, primjerice Wi-Fi, koje utječu na sve.\n\nNakon što stvorite novog korisnika, ta osoba mora proći postupak postavljanja.\n\nBilo koji korisnik može prihvatiti ažurirane dozvole aplikacija u ime svih drugih korisnika."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Nakon što stvorite novog korisnika, ta osoba mora proći postupak postavljanja.\n\nBilo koji korisnik može prihvatiti ažurirane dozvole aplikacija u ime svih drugih korisnika."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Postaviti korisnika sada?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Provjerite može li osoba uzeti tabletno računalo i postaviti svoj prostor"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Želite li sada postaviti profil?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ova postavka utječe na sve korisnike na ovom telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Promjena jezika"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Promjena veličine fonta"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Ograničenja"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Uklanjanje ograničenja"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Promjena PIN-a"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Prikaži obavijesti"</string>
     <string name="help_label" msgid="1107174367904110532">"Pomoć"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Račun za sadržaj"</string>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 89037425c14..0971951120c 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Hely"</item>
     <item msgid="255608127647030286">"Személyes"</item>
     <item msgid="4588829735729884491">"Üzenetváltás"</item>
-    <item msgid="8971765125227378270">"Eszköz"</item>
+    <item msgid="886742181977884584">"Média"</item>
+    <item msgid="7924928667052300589">"Eszköz"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"hozzávetőleges helymeghatározás"</item>
@@ -246,7 +247,7 @@
     <item msgid="6546959730920410907">"hívásnapló módosítása"</item>
     <item msgid="446877710771379667">"naptár olvasása"</item>
     <item msgid="7674458294386319722">"naptár módosítása"</item>
-    <item msgid="8281201165558093009">"wi-fi hálózat keresése"</item>
+    <item msgid="8281201165558093009">"Wi-Fi hálózat keresése"</item>
     <item msgid="8694611243479480497">"értesítés"</item>
     <item msgid="7776439107987345446">"hálózatkeresés"</item>
     <item msgid="514615766544675057">"telefonálás"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"hanganyag lejátszása"</item>
     <item msgid="8374996688066472414">"vágólap olvasása"</item>
     <item msgid="3045529469061083747">"vágólap módosítása"</item>
+    <item msgid="5124443975763747838">"médiagombok"</item>
+    <item msgid="4547883971364273343">"audiofókusz"</item>
+    <item msgid="2603878814882344450">"hangerő-szabályozó"</item>
+    <item msgid="7136963238377062018">"beszéd hangereje"</item>
+    <item msgid="4270236897655923007">"csengés hangereje"</item>
+    <item msgid="6325739889222559394">"média hangereje"</item>
+    <item msgid="5762123934816216821">"ébresztés hangereje"</item>
+    <item msgid="785049718065337473">"értesítés hangereje"</item>
+    <item msgid="6700305533746877052">"bluetooth hangereje"</item>
+    <item msgid="2029227495214047094">"ébren tartás"</item>
+    <item msgid="26109888160231211">"hely figyelése"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Hely"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Hanganyag lejátszása"</item>
     <item msgid="136815868796597058">"Vágólap olvasása"</item>
     <item msgid="5238692940326972503">"Vágólap módosítása"</item>
+    <item msgid="5753789168376302997">"Médiagombok"</item>
+    <item msgid="3265262911688671938">"Audiofókusz"</item>
+    <item msgid="2098976479485046797">"Hangerő-szabályozó"</item>
+    <item msgid="5660213838861789350">"Beszéd hangereje"</item>
+    <item msgid="7983336752371254444">"Csengés hangereje"</item>
+    <item msgid="7878027809189330917">"Média hangereje"</item>
+    <item msgid="7260546305036218513">"Ébresztés hangereje"</item>
+    <item msgid="9103719301075748925">"Értesítés hangereje"</item>
+    <item msgid="7025966722295861512">"Bluetooth hangereje"</item>
+    <item msgid="4665183401128289653">"Ébren tartás"</item>
+    <item msgid="8584357129746649222">"Tartózkodási hely"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Rövid"</item>
     <item msgid="2560532955514699713">"Közepes"</item>
     <item msgid="2372711992605524591">"Hosszú"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (hibakeresési)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"A Dalvik használata"</item>
+    <item msgid="5131846588686178907">"Az ART használata"</item>
+    <item msgid="4530003713865319928">"Az ART hibakeresési verziójának használata"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Ellenőrzés soha"</item>
     <item msgid="6042769699089883931">"Csak DRM-tartalom ellenőrzése"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"A képernyőn sorként"</item>
     <item msgid="120512413928262547">"adb shell dumpsys gfxinfo elemben"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Ki"</item>
+    <item msgid="7688197031296835369">"Tartalom-felülírási területek mutatása"</item>
+    <item msgid="8332661909019981149">"Tartalom-felülírási számláló mutatása"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Normál korlátozás"</item>
     <item msgid="4071574792028999443">"Nincsenek háttérfolyamatok"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 670fd2df468..c4b20f93af6 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Az adatbarangolás engedélyezése jelentős díjnövekedéssel járhat.\n\nEz a beállítás minden felhasználót érint ezen a táblagépen."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Az adatbarangolás engedélyezése jelentős díjnövekedéssel járhat.\n\nEz a beállítás minden felhasználót érint ezen a telefonon."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Engedélyezi az adatbarangolást?"</string>
     <string name="networks" msgid="6333316876545927039">"Szolgáltatóválasztás"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Válassza ki a hálózat üzemeltetőjét"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"A táblagép titkosításának feloldásához kérjen minden bekapcsoláskor egy számokból álló PIN kódot vagy jelszót"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"A telefon titkosításának feloldásához kérjen minden bekapcsoláskor egy számokból álló PIN kódot vagy jelszót"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Titkosítva"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Titkosíthatja a fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve média- és egyéb fájljait. Ha titkosítja táblagépét, akkor minden bekapcsolásakor be kell írnia egy numerikus PIN kódot vagy jelszót a titkosítás feloldásához: táblagépének titkosítását nem tudja visszavonni, kivéve, ha visszaállítja a gyári adatokat, és minden adatot töröl a gépről."\n\n"A titkosítás legalább egy órát vesz igénybe. Feltöltött akkumulátorral kezdjen hozzá, és a titkosítás befejezéséig hagyja töltőn a táblagépet. Ha megszakítja a titkosítási folyamatot, akkor elveszíti néhány vagy az összes adatát."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Titkosíthatja a fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve média- és egyéb fájljait. Ha titkosítja telefonját, akkor minden bekapcsolásakor be kell írnia egy numerikus PIN kódot vagy jelszót a titkosítás feloldásához: telefonjának titkosítását nem tudja visszavonni, kivéve, ha visszaállítja a gyári adatokat, és minden adatot töröl a gépről."\n\n"A titkosítás legalább egy órát vesz igénybe. Feltöltött akkumulátorral kezdjen hozzá, és a titkosítás befejeződéséig hagyja töltőn a telefonját. Ha megszakítja a titkosítási folyamatot, akkor elveszíti néhány vagy az összes adatát."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Titkosíthatja a fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve média- és egyéb fájljait. Ha titkosítja táblagépét, akkor minden bekapcsolásakor be kell írnia egy numerikus PIN kódot vagy jelszót a titkosítás feloldásához: táblagépének titkosítását nem tudja visszavonni, kivéve, ha visszaállítja a gyári adatokat, és minden adatot töröl a gépről.\n\nA titkosítás legalább egy órát vesz igénybe. Feltöltött akkumulátorral kezdjen hozzá, és a titkosítás befejezéséig hagyja töltőn a táblagépet. Ha megszakítja a titkosítási folyamatot, akkor elveszíti néhány vagy az összes adatát."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Titkosíthatja a fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve média- és egyéb fájljait. Ha titkosítja telefonját, akkor minden bekapcsolásakor be kell írnia egy numerikus PIN kódot vagy jelszót a titkosítás feloldásához: telefonjának titkosítását nem tudja visszavonni, kivéve, ha visszaállítja a gyári adatokat, és minden adatot töröl a gépről.\n\nA titkosítás legalább egy órát vesz igénybe. Feltöltött akkumulátorral kezdjen hozzá, és a titkosítás befejeződéséig hagyja töltőn a telefonját. Ha megszakítja a titkosítási folyamatot, akkor elveszíti néhány vagy az összes adatát."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Táblagép titkosítása"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefon titkosítása"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Töltse fel az akkumulátort, és próbálja újra."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Próbálja újra <xliff:g id="DELAY">^1</xliff:g> másodperc múlva."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Írja be a jelszavát"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"A titkosítás sikertelen"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"A titkosítás megszakadt, és nem lehet befejezni. Ezért a táblagépen található adatokhoz nem lehet hozzáférni. "\n\n"Ahhoz, hogy újra használni tudja táblagépét, vissza kell állítani a gyári beállításokat. Amikor a visszaállítás után beállítja táblagépét, lehetősége lesz minden adat visszaállítására, amelyet a rendszer tárolt a Google Fiókjában."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"A titkosítás megszakadt, és nem lehet befejezni. Ezért a telefonon található adatokhoz nem lehet hozzáférni. "\n\n"Ahhoz, hogy újra használni tudja telefonját, vissza kell állítani a gyári beállításokat. Amikor a visszaállítás után beállítja telefonját, lehetősége lesz minden adat visszaállítására, amelyet a rendszer eltárolt a Google Fiókjában."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"A titkosítás megszakadt, és nem lehet befejezni. Ezért a táblagépen található adatokhoz nem lehet hozzáférni. \n\nAhhoz, hogy újra használni tudja táblagépét, vissza kell állítani a gyári beállításokat. Amikor a visszaállítás után beállítja táblagépét, lehetősége lesz minden adat visszaállítására, amelyet a rendszer tárolt a Google Fiókjában."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"A titkosítás megszakadt, és nem lehet befejezni. Ezért a telefonon található adatokhoz nem lehet hozzáférni. \n\nAhhoz, hogy újra használni tudja telefonját, vissza kell állítani a gyári beállításokat. Amikor a visszaállítás után beállítja telefonját, lehetősége lesz minden adat visszaállítására, amelyet a rendszer eltárolt a Google Fiókjában."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Beviteli mód váltása"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Képernyőzár választása"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Biztonsági zárolás"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Csatlakozás"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Csatlakozva"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Elérhető"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Használatban"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Megjelenítési beállítások"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Megszakítja?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Ezzel befejezi a kapcsolatot a következővel:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Ki"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nem érhető el, mert az NFC ki van kapcsolva"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Ha ez a funkció be van kapcsolva, alkalmazástartalmat sugározhat át egy másik NFC-kompatibilis eszközre úgy, hogy egymáshoz közel tartja az eszközöket. Például átsugározhat böngészőoldalalakat, YouTube-videókat, névjegyeket stb."\n\n"Mindössze helyezze az eszközöket egymáshoz közel (lehetőleg a hátlapjaikat összeérintve), majd érintse meg a képernyőt. Az alkalmazás eldönti, hogy mit fog átsugározni."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Ha ez a funkció be van kapcsolva, alkalmazástartalmat sugározhat át egy másik NFC-kompatibilis eszközre úgy, hogy egymáshoz közel tartja az eszközöket. Például átsugározhat böngészőoldalalakat, YouTube-videókat, névjegyeket stb.\n\nMindössze helyezze az eszközöket egymáshoz közel (lehetőleg a hátlapjaikat összeérintve), majd érintse meg a képernyőt. Az alkalmazás eldönti, hogy mit fog átsugározni."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Hálózati szolgáltatások keresése"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Más eszközökön lévő alkalmazások láthatják az ezen a készüléken lévő alkalmazásokat."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> védelemmel"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> védelemmel"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nincs"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"A helymeghatározás pontosságának javítása és egyéb célok érdekében a(z) <xliff:g id="APP_NAME">%1$s</xliff:g> szeretné engedélyezni a hálózatkeresést még kikapcsolt Wi-Fi mellett is."\n\n"Engedélyezi ezt az összes olyan alkalmazásnál, amely keresést akar végezni?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"A helymeghatározás pontosságának javítása és egyéb célok érdekében a(z) <xliff:g id="APP_NAME">%1$s</xliff:g> szeretné engedélyezni a hálózatkeresést még kikapcsolt Wi-Fi mellett is.\n\nEngedélyezi ezt az összes olyan alkalmazásnál, amely keresést akar végezni?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Engedélyezés"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Elutasítás"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Kapcsolódás"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"FIGYELEM: Előfordulhat, hogy szolgáltatója további adatátviteli díjakat számít fel.\n\nA táblagép beállításához jelentős hálózati tevékenységre lehet szükség."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"FIGYELEM: Előfordulhat, hogy szolgáltatója további adatátviteli díjakat számít fel.\n\nA telefon beállításához jelentős hálózati tevékenységre lehet szükség."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"FIGYELEM: amíg nincs internetkapcsolat, a táblagép nem tudja ellenőrizni, hogy a szoftver naprakész-e."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"FIGYELEM: amíg nincs internetkapcsolat, a telefon nem tudja ellenőrizni, hogy a szoftver naprakész-e."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"A táblagép nem tudott csatlakozni ehhez a Wi-Fi hálózathoz."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM-kártya PIN-kódja"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Helytelen PIN kód"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"A PIN kódok nem egyeznek"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Nem lehet megváltoztatni a PIN kódot."\n"Lehet, hogy hibás a PIN kód."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Nem lehet megváltoztatni a PIN kódot.\nLehet, hogy hibás a PIN kód."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"A SIM-kártya PIN-kódja sikeresen módosításra került"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Nem lehet megváltoztatni a SIM-kártya zárolási állapotát."\n"Lehet, hogy hibás a PIN kód."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Nem lehet megváltoztatni a SIM-kártya zárolási állapotát.\nLehet, hogy hibás a PIN kód."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Mégse"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Táblagép állapota"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Gyári adatok visszaállítása"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Törli az összes adatot a táblagépről"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Minden adat törlése a telefonról"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ez minden adatot töröl a táblagép "<b>"belső tárolójáról"</b>", többek között: "\n" "\n<li>"Google Fiókját"</li>\n<li>"A rendszer- és alkalmazásadatokat és beállításokat"</li>" "\n" "<li>"A letöltött alkalmazásokat"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Ez minden adatot töröl a telefon "<b>"belső tárolójáról"</b>", többek között: "\n" "\n<li>"Google Fiókját"</li>\n<li>"A rendszer- és alkalmazásadatokat és beállításokat"</li>" "\n" "<li>"A letöltött alkalmazásokat"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jelenleg a következő fiókokba van bejelentkezve:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ez minden adatot töröl a táblagép "<b>"belső tárolójáról"</b>", többek között: \n \n"<li>"Google Fiókját"</li>\n<li>"A rendszer- és alkalmazásadatokat és beállításokat"</li>" \n "<li>"A letöltött alkalmazásokat"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Ez minden adatot töröl a telefon "<b>"belső tárolójáról"</b>", többek között: \n \n"<li>"Google Fiókját"</li>\n<li>"A rendszer- és alkalmazásadatokat és beállításokat"</li>" \n "<li>"A letöltött alkalmazásokat"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jelenleg a következő fiókokba van bejelentkezve:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Zene"</li>\n<li>"Fotók"</li>\n<li>"Más felhasználói adatok"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"USB-tárat"</b>" is törölnie kell."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"SD-kártyát"</b>" is törölnie kell."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Tárolt folyamatok"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Alapbeállítások"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Visszaállítja a beállításokat?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ez visszaállítja az összes beállítást a következőknél:"\n\n" "<li>"Letiltott alkalmazások"</li>\n" "<li>"Letiltott alkalmazásokkal kapcsolatos értesítések"</li>\n" "<li>"Alapértelmezett alkalmazások az egyes műveletekhez"</li>\n" "<li>"Háttéradatokra vonatkozó korlátozások az alkalmazásoknál"</li>\n\n" Az alkalmazásokban található adatok nem fognak elveszni."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ez visszaállítja az összes beállítást a következőknél:\n\n "<li>"Letiltott alkalmazások"</li>\n" "<li>"Letiltott alkalmazásokkal kapcsolatos értesítések"</li>\n" "<li>"Alapértelmezett alkalmazások az egyes műveletekhez"</li>\n" "<li>"Háttéradatokra vonatkozó korlátozások az alkalmazásoknál"</li>\n\n" Az alkalmazásokban található adatok nem fognak elveszni."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Alapbeállítások"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Terület kezelése"</string>
     <string name="filter" msgid="2018011724373033887">"Szűrő"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Váltáshoz nyomja meg a Control+szóköz billentyűkódot"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Alapértelmezett"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Billentyűzetkiosztások"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Felhasználói szótár"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Személyes szótár"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Személyes szótárak"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Személyes szótár"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Hozzáadás"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Hozzáadás a szótárhoz"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Lehetőség az energiaellátási menüben a hibajelentésekre"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Nem kapcsolódik ki"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"A képernyő soha nem kapcsol ki töltés során"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI snoop napló engedélyezése"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Az összes Bluetooth HCI-csomag rögzítése egy fájlban"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Futtatási környezet kiválasztása"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Futtatási környezet kiválasztása"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Újraindítja, hogy a futtatási környezet módosuljon <xliff:g id="OLD">%1$s</xliff:g> beállításról <xliff:g id="NEW">%2$s</xliff:g> beállításra?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Helyutánzatok engedélyezése"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Helyutánzatok engedélyezése"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Engedélyezi az USB hibakeresést?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USB-tár védetté tétele"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Alkalmazások kérjenek engedélyt az USB-n lévő adatok olvasására"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Védetté teszi az USB-tárat?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Ha az USB-háttértár védett, az alkalmazásoknak engedélyt kell kérniük a külső tárhelyen tárolt adatok olvasására."\n\n"Előfordulhat, hogy egyes alkalmazások nem működnek addig, amíg a fejlesztők nem frissítik azokat."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Ha az USB-háttértár védett, az alkalmazásoknak engedélyt kell kérniük a külső tárhelyen tárolt adatok olvasására.\n\nElőfordulhat, hogy egyes alkalmazások nem működnek addig, amíg a fejlesztők nem frissítik azokat."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"SD-kártya védetté tétele"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Az alkalmazások kérjenek engedélyt az SD-kártya olvasására"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Védetté teszi az SD-kártyát?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Ha az SD-kártya védett, az alkalmazásoknak engedélyt kell kérniük a külső tárhelyen tárolt adatok olvasására."\n\n"Előfordulhat, hogy egyes alkalmazások nem működnek addig, amíg a fejlesztők nem frissítik azokat."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Ha az SD-kártya védett, az alkalmazásoknak engedélyt kell kérniük a külső tárhelyen tárolt adatok olvasására.\n\nElőfordulhat, hogy egyes alkalmazások nem működnek addig, amíg a fejlesztők nem frissítik azokat."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Helyi végpont"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Végalkalmazás engedélyezése a helyi rendszerhéj eléréséhez"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Modul kiválasztása"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Modul kiválasztása"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Létrehozza a modult, és engedélyezi a hozzáférést?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Szolgáltatások"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Rendszer"</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_screen_magnification_summary" msgid="2380627654189671754">"Ha a funkció be van kapcsolva, úgy kicsinyíthet/nagyíthat, hogy háromszor rákoppint a képernyőre.\n\nNagyított állapotban:\n"<ul><li>"Pásztázhat: Két vagy több ujját húzza végig a képernyőn."</li>\n<li>"Módosíthatja a nagyítási szintet: Két ujját húzza össze vagy távolítsa el egymástól."</li></ul>\n\n"Ideiglenesen felnagyíthatja az ujja alatt lévő részt is, úgy hogy hármat koppint és lenyomva hagyja ujját. A nagyított nézetben az ujját húzva fedezheti fel a képernyő más részeit is. Az ujja felemelésével visszatérhet az előző állapotra.\n\nMegjegyzés: A háromszoros koppintással való nagyítás a billentyűzet és a navigációs sáv kivételével mindenhol működik."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Hozzáférési gyorskombináció"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Be"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Ki"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Ha a funkció engedélyezve van, gyorsan elérheti a kisegítő lehetőségeket két lépésben:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Ha a funkció engedélyezve van, gyorsan elérheti a kisegítő lehetőségeket két lépésben:\n\n1. lépés: tartsa lenyomva a bekapcsológombot a hangjelzésig vagy rezgésig.\n\n2. lépés: két ujját tartsa lenyomva a hangjelzéssel történő jóváhagyásig.\n\nHa az eszközt több felhasználó is használja, akkor e kombináció zárolási képernyőn való használatával ideiglenesen hozzáférhetővé válik az eszköz, amíg fel nem oldják azt."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Nagy szöveg"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Képernyőnagyítás"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Képernyőnagyítás automatikus frissítése"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"A TalkBack beszéddel történő visszajelzést kínál vak és gyengénlátó felhasználók számára. Szeretné ingyen telepíteni az Android Marketről?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nincs leírás."</string>
     <string name="settings_button" msgid="3006713718908152930">"Beállítások"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Nyomtatás"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Nyomtatási beállítások"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Szolgáltatások"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Használja a következő szolgáltatást: <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"A(z) <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> képes fogadni az Ön által nyomtatott dokumentumokat, amelyek bizalmas adatokat tartalmazhatnak."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Nincs telepített szolgáltatás"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Beállítások"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Nyomtatók hozzáadása"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Be"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Ki"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Akkumulátor"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Mi használta az akkumulátort"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Nincs akkuhasználati adat"</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi használat"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Táblagép"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Elküldött adatok"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Fogadott adatok"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Küldött mobiladat"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Fogadott mobiladat"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Küldött Wi‑Fi adat"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Fogadott Wi-Fi adat"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Hang"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Videó"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Bekapcsolva eltöltött idő"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Hangmagasság"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"A beszélt szöveg hangszínét befolyásolja"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Nyelv"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nincs nyelv kiválasztva"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Beállítja a beszélt szöveg nyelvspecifikus hangját"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Példa meghallgatása"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Rövid demonstráció megtekintése a beszédszintézisről"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP nem támogatott."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"A beállítás során nem állíthat be EAP Wi-Fi kapcsolatot. Ezt a beállítás után a Beállításokban teheti meg, a Vezeték nélküli és egyéb hálózatok menüpontban."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"A kapcsolódás igénybe vehet pár percet..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Érintse meg a "<b>"Tovább"</b>" lehetőséget a telepítés folytatásához."\n\n"Érintse meg a "<b>"Vissza"</b>" lehetőséget egy másik Wi-Fi-hálózathoz való csatlakozáshoz."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Érintse meg a "<b>"Tovább"</b>" lehetőséget a telepítés folytatásához.\n\nÉrintse meg a "<b>"Vissza"</b>" lehetőséget egy másik Wi-Fi-hálózathoz való csatlakozáshoz."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Szinkronizálás engedélyezve"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Szinkronizálás letiltva"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Szinkronizálási hiba"</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Naptár"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Címtár"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Üdvözli a Google Sync!"</font>" "\n"Az adatok Google-féle szinkronizálása lehetővé teszi, hogy bárhonnan hozzáférjen címtárához, találkozóihoz stb."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Üdvözli a Google Sync!"</font>" \nAz adatok Google-féle szinkronizálása lehetővé teszi, hogy bárhonnan hozzáférjen címtárához, találkozóihoz stb."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Alkalmazás-szinkronizálási beállítások"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Adatok és szinkronizálás"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Jelszó módosítása"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"GPU tartalom-felülírási hibakeresés"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW fedvények letiltása"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Mindig a GPU használata képernyő-feldolgozáshoz"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL nyomon követése"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Háttéradatok kikapcsolása mobilhálózaton. Nem mobil hálózatok használata."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Háttéradatok korlátozásához előbb állítson be mobiladatkorlátot."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Korlátozza a háttéradatokat?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Lehetséges, hogy e funkció miatt a háttéradatoktól függő alkalmazások nem fognak működni, ha csak mobilhálózatok állnak rendelkezésre."\n\n"Az alkalmazásban lévő beállítások között megfelelőbb adathasználati beállításokat találhat."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Lehetséges, hogy e funkció miatt a háttéradatoktól függő alkalmazások nem fognak működni, ha csak mobilhálózatok állnak rendelkezésre.\n\nAz alkalmazásban lévő beállítások között megfelelőbb adathasználati beállításokat találhat."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"A háttéradatok korlátozása csak akkor lehetséges, ha beállított mobil adatkorlátot."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Bekapcsolja a szinkronizálást?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Az interneten végrehajtott fiókmódosítások automatikusan megjelennek táblagépén is."\n\n"Egyes fiókok esetében ez fordítva is igaz. A Google Fiók az utóbbi szerint működik."\n\n"Annak kiválasztásához, hogy mi legyen szinkronizálva az egyes fiókokon belül, menjen a Beállítások &gt; Fiókok lehetőségre."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Az interneten végrehajtott fiókmódosítások automatikusan megjelennek telefonján is."\n\n"Egyes fiókok esetében ez fordítva is igaz. A Google Fiók az utóbbi szerint működik."\n\n"Annak kiválasztásához, hogy mi legyen szinkronizálva az egyes fiókokon belül, menjen a Beállítások &gt; Fiókok lehetőségre."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Az interneten végrehajtott fiókmódosítások automatikusan megjelennek táblagépén is.\n\nEgyes fiókok esetében ez fordítva is igaz. A Google Fiók az utóbbi szerint működik.\n\nAnnak kiválasztásához, hogy mi legyen szinkronizálva az egyes fiókokon belül, menjen a Beállítások &gt; Fiókok lehetőségre."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Az interneten végrehajtott fiókmódosítások automatikusan megjelennek telefonján is.\n\nEgyes fiókok esetében ez fordítva is igaz. A Google Fiók az utóbbi szerint működik.\n\nAnnak kiválasztásához, hogy mi legyen szinkronizálva az egyes fiókokon belül, menjen a Beállítások &gt; Fiókok lehetőségre."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Kikapcsolja a szinkronizálást?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Ez mérsékelni fogja az adat- és akkumulátorhasználatot, de minden egyes fiókot manuálisan kell majd szinkronizálnia a legfrissebb információk begyűjtéséhez. Továbbá nem fog értesítéseket kapni a frissítésekről."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Használati ciklus visszaállításának ideje"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Adathasználati figyelmeztetés beállítása"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Adathasználati korlát beállítása"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Adatforgalom korlátozása"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"A mobilhálózat adatkapcsolatát a rendszer letiltja a megadott korlát elérésekor."\n\n"Mivel az adathasználatot a táblagép méri, és a szolgáltató mérése eltérhet ettől, célszerű óvatosabb korlátot beállítani."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"A mobilhálózat adatkapcsolatát a rendszer letiltja a megadott korlát elérésekor."\n\n"Mivel az adathasználatot a telefon méri, és a szolgáltató mérése eltérhet ettől, célszerű óvatosabb korlátot beállítani."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"A mobilhálózat adatkapcsolatát a rendszer letiltja a megadott korlát elérésekor.\n\nMivel az adathasználatot a táblagép méri, és a szolgáltató mérése eltérhet ettől, célszerű óvatosabb korlátot beállítani."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"A mobilhálózat adatkapcsolatát a rendszer letiltja a megadott korlát elérésekor.\n\nMivel az adathasználatot a telefon méri, és a szolgáltató mérése eltérhet ettől, célszerű óvatosabb korlátot beállítani."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Korlátozza a háttéradatokat?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Ha korlátozza a háttérben zajló mobil adatforgalmat, néhány alkalmazás és szolgáltatás nem fog működni, ha a Wi-Fi nincs engedélyezve."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ha korlátozza a háttérben futó mobil adatátvitelt, bizonyos alkalmazások és szolgáltatások nem fognak működni, amíg nem kapcsolódik Wi-Fi hálózathoz."\n\n"Ez a beállítás minden felhasználót érint ezen a táblagépen."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ha korlátozza a háttérben futó mobil adatátvitelt, bizonyos alkalmazások és szolgáltatások nem fognak működni, amíg nem kapcsolódik Wi-Fi hálózathoz."\n\n"Ez a beállítás minden felhasználót érint ezen a telefonon."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ha korlátozza a háttérben futó mobil adatátvitelt, bizonyos alkalmazások és szolgáltatások nem fognak működni, amíg nem kapcsolódik Wi-Fi hálózathoz.\n\nEz a beállítás minden felhasználót érint ezen a táblagépen."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ha korlátozza a háttérben futó mobil adatátvitelt, bizonyos alkalmazások és szolgáltatások nem fognak működni, amíg nem kapcsolódik Wi-Fi hálózathoz.\n\nEz a beállítás minden felhasználót érint ezen a telefonon."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"figyelmeztetés"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"korlát"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Eltávolított alkalmazások"</string>
@@ -1845,8 +1863,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Felhasználó"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Korlátozott profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Új felhasználó hozzáadása"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Ezt a készüléket további felhasználókat létrehozva megoszthatja más személyekkel. Minden felhasználó rendelkezik saját térrel, amelyet személyre szabhat saját alkalmazásaival, háttérképével stb. A felhasználók módosíthatják a táblagép olyan beállításait is, amelyek mindenkit érintenek, például a Wi-Fi beállításait."\n" "\n"Miután létrehoz egy új felhasználót, az adott személynek el kell végeznie egy telepítési folyamatot."\n\n"Minden felhasználó elfogadhatja a frissített alkalmazások engedélyeit az összes többi felhasználó nevében."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"Miután létrehozott egy új felhasználót, az adott személynek keresztül kell mennie egy telepítési folyamaton."\n" "\n"Minden felhasználó elfogadhatja a frissített alkalmazások engedélyeit az összes többi felhasználó nevében."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Ezt a készüléket további felhasználókat létrehozva megoszthatja más személyekkel. Minden felhasználó rendelkezik saját térrel, amelyet személyre szabhat saját alkalmazásaival, háttérképével stb. A felhasználók módosíthatják a táblagép olyan beállításait is, amelyek mindenkit érintenek, például a Wi-Fi beállításait.\n \nMiután létrehoz egy új felhasználót, az adott személynek el kell végeznie egy telepítési folyamatot.\n\nMinden felhasználó elfogadhatja a frissített alkalmazások engedélyeit az összes többi felhasználó nevében."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Miután létrehozott egy új felhasználót, az adott személynek keresztül kell mennie egy telepítési folyamaton.\n \nMinden felhasználó elfogadhatja a frissített alkalmazások engedélyeit az összes többi felhasználó nevében."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Beállít most egy felhasználót?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Győződjön meg arról, hogy a személy hozzá tud férni a táblagéphez, hogy beállíthassa a területét"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Létrehoz most egy profilt?"</string>
@@ -1877,6 +1895,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ez a beállítás minden felhasználót érint ezen a telefonon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Nyelv módosítása"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Betűméret módosítása"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Korlátozások"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Korlátozások feloldása"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN kód módosítása"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Értesítések megjelenítése"</string>
     <string name="help_label" msgid="1107174367904110532">"Súgó"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Tartalom fiókja"</string>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index baa34d0c7bc..b2a7df5bd1b 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Lokasi"</item>
     <item msgid="255608127647030286">"Pribadi"</item>
     <item msgid="4588829735729884491">"Perpesanan"</item>
-    <item msgid="8971765125227378270">"Perangkat"</item>
+    <item msgid="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Perangkat"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"lokasi sementara"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"putar audio"</item>
     <item msgid="8374996688066472414">"baca papan klip"</item>
     <item msgid="3045529469061083747">"ubah papan klip"</item>
+    <item msgid="5124443975763747838">"tombol media"</item>
+    <item msgid="4547883971364273343">"fokus audio"</item>
+    <item msgid="2603878814882344450">"volume master"</item>
+    <item msgid="7136963238377062018">"volume suara"</item>
+    <item msgid="4270236897655923007">"volume dering"</item>
+    <item msgid="6325739889222559394">"volume media"</item>
+    <item msgid="5762123934816216821">"volume alarm"</item>
+    <item msgid="785049718065337473">"volume pemberitahuan"</item>
+    <item msgid="6700305533746877052">"volume bluetooth"</item>
+    <item msgid="2029227495214047094">"tetap aktif"</item>
+    <item msgid="26109888160231211">"monitor lokasi"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokasi"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Putar audio"</item>
     <item msgid="136815868796597058">"Baca papan klip"</item>
     <item msgid="5238692940326972503">"Ubah papan klip"</item>
+    <item msgid="5753789168376302997">"Tombol media"</item>
+    <item msgid="3265262911688671938">"Fokus audio"</item>
+    <item msgid="2098976479485046797">"Volume utama"</item>
+    <item msgid="5660213838861789350">"Volume suara"</item>
+    <item msgid="7983336752371254444">"Volume dering"</item>
+    <item msgid="7878027809189330917">"Volume media"</item>
+    <item msgid="7260546305036218513">"Volume alarm"</item>
+    <item msgid="9103719301075748925">"Volume pemberitahuan"</item>
+    <item msgid="7025966722295861512">"Volume bluetooth"</item>
+    <item msgid="4665183401128289653">"Tetap aktif"</item>
+    <item msgid="8584357129746649222">"Lokasi"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Singkat"</item>
     <item msgid="2560532955514699713">"Sedang"</item>
     <item msgid="2372711992605524591">"Lama"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (debug)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Gunakan Dalvik"</item>
+    <item msgid="5131846588686178907">"Gunakan ART"</item>
+    <item msgid="4530003713865319928">"Gunakan bentukan debug ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Jangan periksa"</item>
     <item msgid="6042769699089883931">"Periksa hanya konten DRM"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Di layar dalam bentuk garis"</item>
     <item msgid="120512413928262547">"Di adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Nonaktif"</item>
+    <item msgid="7688197031296835369">"Tampilkan area overdraw"</item>
+    <item msgid="8332661909019981149">"Lihat penghitung overdraw"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Batas standar"</item>
     <item msgid="4071574792028999443">"Tanpa proses latar belakang"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index f6f9149f1e8..cd37a1eed81 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Jika Anda mengizinkan roaming data, Anda mungkin dikenai tagihan roaming!\n\nSetelan ini memengaruhi semua pengguna di tablet ini."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Jika Anda mengizinkan roaming data, Anda mungkin dikenai tagihan roaming!\n\nSetelan ini memengaruhi semua pengguna di ponsel ini."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Izinkan roaming data?"</string>
     <string name="networks" msgid="6333316876545927039">"Pilihan operator"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Pilih operator jaringan"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Memerlukan PIN atau sandi angka untuk mengurai enkripsi tablet tiap kali Anda menyalakannya"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Memerlukan PIN atau sandi angka untuk mengurai enkripsi ponsel tiap kali Anda menyalakannya"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Dienkripsi"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Anda dapat mengenkripsi akun, setelan, apl yang diunduh dan datanya, media, serta file lainnya. Setelah mengenkripsi tablet, Anda perlu memasukkan PIN numerik atau sandi untuk mendekripsinya setiap kali Anda menyalakannya. Anda tidak dapat membatalkan enkripsi tablet kecuali dengan mengembalikannya ke setelan pabrik yang akan menghapus seluruh data Anda."\n\n"Enkripsi memakan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dan terus menghubungkan tablet dengan sumber daya hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data Anda."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Anda dapat mengenkripsi akun, setelan, apl yang diunduh dan datanya, media, serta file lainnya. Setelah mengenkripsi ponsel, Anda perlu memasukkan PIN numerik atau sandi untuk mendekripsinya setiap kali Anda menghidupkannya. Anda tidak dapat membatalkan enkripsi ponsel kecuali dengan mengembalikan ke setelan pabrik dan akan menghapus seluruh data Anda."\n\n"Enkripsi memakan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dan terus menghubungkan ponsel dengan sumber daya hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data Anda."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Anda dapat mengenkripsi akun, setelan, apl yang diunduh dan datanya, media, serta file lainnya. Setelah mengenkripsi tablet, Anda perlu memasukkan PIN numerik atau sandi untuk mendekripsinya setiap kali Anda menyalakannya. Anda tidak dapat membatalkan enkripsi tablet kecuali dengan mengembalikannya ke setelan pabrik yang akan menghapus seluruh data Anda.\n\nEnkripsi memakan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dan terus menghubungkan tablet dengan sumber daya hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data Anda."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Anda dapat mengenkripsi akun, setelan, apl yang diunduh dan datanya, media, serta file lainnya. Setelah mengenkripsi ponsel, Anda perlu memasukkan PIN numerik atau sandi untuk mendekripsinya setiap kali Anda menghidupkannya. Anda tidak dapat membatalkan enkripsi ponsel kecuali dengan mengembalikan ke setelan pabrik dan akan menghapus seluruh data Anda.\n\nEnkripsi memakan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dan terus menghubungkan ponsel dengan sumber daya hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data Anda."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Enkripsi tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Enkripsi ponsel"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Isi daya baterai Anda dan coba lagi."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Coba lagi dalam <xliff:g id="DELAY">^1</xliff:g> detik."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Ketikkan sandi Anda"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripsi gagal"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data pada tablet Anda tidak dapat diakses lagi. "\n\n" Untuk terus menggunakan tablet, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data di ponsel Anda tidak dapat diakses lagi. "\n\n" Untuk terus menggunakan ponsel, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan ponsel setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data pada tablet Anda tidak dapat diakses lagi. \n\n Untuk terus menggunakan tablet, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan tablet setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Enkripsi terputus dan tidak dapat diselesaikan. Akibatnya, data di ponsel Anda tidak dapat diakses lagi. \n\n Untuk terus menggunakan ponsel, Anda perlu mengembalikannya ke setelan pabrik. Saat menyiapkan ponsel setelah mengembalikannya ke setelan pabrik, Anda memiliki kesempatan untuk memulihkan data apa pun yang telah dicadangkan ke Akun Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Beralih metode masukan"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pilih kunci layar"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pilih gembok cadangan"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Menyambung"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Tersambung"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Tersedia"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Sedang digunakan"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Setelan layar"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Putuskan sambungan?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Ini akan mengakhiri sambungan Anda dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Mati"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Tidak tersedia karena NFC dimatikan"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Jika fitur ini dihidupkan, Anda dapat memancarkan konten apl ke perangkat berkemampuan NFC lainnya dengan mendekatkan kedua perangkat. Contohnya, Anda dapat memancarkan laman Browser, video YouTube, kontak Orang, dan lain-lain."\n\n"Cukup dekatkan kedua perangkat (biasanya saling membelakangi) lalu sentuh layar Anda. Apl ini akan menentukan apa yang dipancarkan."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Jika fitur ini dihidupkan, Anda dapat memancarkan konten apl ke perangkat berkemampuan NFC lainnya dengan mendekatkan kedua perangkat. Contohnya, Anda dapat memancarkan laman Browser, video YouTube, kontak Orang, dan lain-lain.\n\nCukup dekatkan kedua perangkat (biasanya saling membelakangi) lalu sentuh layar Anda. Apl ini akan menentukan apa yang dipancarkan."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Penemuan layanan jaringan"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Izinkan aplikasi di perangkat lain menemukan aplikasi di perangkat ini"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Diamankan dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", diamankan dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Tidak Ada"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Untuk meningkatkan ketepatan lokasi dan untuk tujuan lainnya, <xliff:g id="APP_NAME">%1$s</xliff:g> ingin mengaktifkan pemindaian jaringan, bahkan saat Wi-Fi sedang tidak aktif."\n\n"Izinkan ini untuk semua aplikasi yang ingin memindai?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Untuk meningkatkan ketepatan lokasi dan untuk tujuan lainnya, <xliff:g id="APP_NAME">%1$s</xliff:g> ingin mengaktifkan pemindaian jaringan, bahkan saat Wi-Fi sedang tidak aktif.\n\nIzinkan ini untuk semua aplikasi yang ingin memindai?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Izinkan"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Tolak"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Sambungkan"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"PERINGATAN: Anda mungkin dikenai tagihan data operator tambahan.\n\nPenyiapan tablet mungkin memerlukan aktivitas jaringan yang signifikan."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"PERINGATAN: Anda mungkin dikenai tagihan data operator tambahan.\n\nPenyiapan ponsel mungkin memerlukan aktivitas jaringan yang signifikan."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"PERINGATAN: Hingga Anda memiliki koneksi internet, tablet tidak akan dapat memverifikasi bahwa perangkat lunak Anda telah diperbarui."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"PERINGATAN: Hingga Anda memiliki koneksi internet, ponsel tidak akan dapat memverifikasi bahwa perangkat lunak Anda telah diperbarui."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet tidak dapat menyambung ke jaringan Wi-Fi ini."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN salah"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN tidak cocok"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Tidak dapat mengubah PIN."\n"PIN mungkin salah."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Tidak dapat mengubah PIN.\nPIN mungkin salah."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN SIM berhasil diubah"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Tidak bisa mengubah status kunci kartu SIM."\n"PIN Mungkin salah."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Tidak bisa mengubah status kunci kartu SIM.\nPIN Mungkin salah."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Oke"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Batal"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status tablet"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Kembalikan ke setelan pabrik"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Hapus semua data di tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Hapus semua data pada ponsel"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" tablet Anda, termasuk:"\n\n<li>"Akun Google Anda"</li>\n<li>"Data sistem dan apl serta setelan"</li>\n<li>"Apl unduhan"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" ponsel Anda, termasuk:"\n\n<li>"Akun Google Anda"</li>\n<li>"Data sistem dan apl serta setelan"</li>\n<li>"Apl unduhan"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Saat ini Anda telah masuk ke akun berikut ini:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" tablet Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan apl serta setelan"</li>\n<li>"Apl unduhan"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" ponsel Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan apl serta setelan"</li>\n<li>"Apl unduhan"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Saat ini Anda telah masuk ke akun berikut ini:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna lainnya"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Untuk menghapus gambar, musik, dan data pengguna lainnya, "<b>"penyimpanan USB"</b>" perlu dihapus."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Untuk menghapus musik, gambar, dan data pengguna lainnya, "<b>"kartu SD"</b>" perlu dihapus."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Tampilkn proses pd tmbolok"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Setel ulang pref aplikasi"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Setel ulang pref aplikasi?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Tindakan ini akan menyetel ulang semua preferensi untuk:"\n\n" "<li>"Aplikasi yang dinonaktifkan"</li>\n" "<li>"Pemberitahuan aplikasi yang dinonaktifkan"</li>\n" "<li>"Aplikasi default untuk tindakan"</li>\n" "<li>"Batas data latar belakang untuk aplikasi"</li>\n\n" Anda tidak akan kehilangan data aplikasi apa pun."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Tindakan ini akan menyetel ulang semua preferensi untuk:\n\n "<li>"Aplikasi yang dinonaktifkan"</li>\n" "<li>"Pemberitahuan aplikasi yang dinonaktifkan"</li>\n" "<li>"Aplikasi default untuk tindakan"</li>\n" "<li>"Batas data latar belakang untuk aplikasi"</li>\n\n" Anda tidak akan kehilangan data aplikasi apa pun."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Setel ulang aplikasi"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Kelola ruang"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Untuk beralih, tekan Control-Spasi"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Default"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tata letak keyboard"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kamus pengguna"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Kamus pribadi"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Kamus pribadi"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Kamus pribadi"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Tambahkan"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Tambahkan ke kamus"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Menyertakan opsi dalam menu daya untuk mengambil laporan bug"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Tetap terjaga"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Layar tidak akan redup selama mengisi daya"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktifkan log pengintaian HCI Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tangkap semua paket HCI bluetooth di dalam file"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Pilih waktu operasi"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Pilih waktu operasi"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Nyalakan ulang untuk mengubah waktu operasi dari <xliff:g id="OLD">%1$s</xliff:g> ke <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Mengizinkan lokasi palsu"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Mengizinkan lokasi palsu"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Izinkan melakukan debug USB?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Lindungi penyimpanan USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplikasi harus meminta izin untuk membaca penyimpanan USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Lindungi penyimpanan USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Jika penyimpanan USB dilindungi, aplikasi harus meminta izin untuk membaca data dari penyimpanan eksternal."\n\n"Beberapa aplikasi mungkin tidak berfungsi sebelum diperbarui oleh pengembangnya."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Jika penyimpanan USB dilindungi, aplikasi harus meminta izin untuk membaca data dari penyimpanan eksternal.\n\nBeberapa aplikasi mungkin tidak berfungsi sebelum diperbarui oleh pengembangnya."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Lindungi kartu SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikasi harus meminta izin untuk membaca kartu SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Lindungi kartu SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Jika kartu SD dilindungi, aplikasi harus meminta izin untuk membaca data dari penyimpanan eksternal."\n\n"Beberapa aplikasi mungkin tidak berfungsi sebelum diperbarui oleh pengembangnya."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Jika kartu SD dilindungi, aplikasi harus meminta izin untuk membaca data dari penyimpanan eksternal.\n\nBeberapa aplikasi mungkin tidak berfungsi sebelum diperbarui oleh pengembangnya."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal lokal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Aktifkan aplikasi terminal yang menawarkan akses kerangka lokal"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Pilih gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Pilih widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Buat widget dan izinkan akses?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Layanan"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</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_screen_magnification_summary" msgid="2380627654189671754">"Saat fitur ini diaktifkan, Anda dapat memperbesar dan memperkecil dengan mengetuk layar tiga kali.\n\nSaat memperbesar, Anda dapat:\n"<ul><li>"Menggeser: Seret dua jari atau lebih melintasi layar."</li>\n<li>"Menyesuaikan tingkat pembesaran/pengecilan: Cubit dua jari atau lebih bersamaan atau rentangkan jari Anda."</li></ul>\n\n"Anda juga dapat memperbesar yang ada di bawah jari Anda secara sementara dengan mengetuk tiga kali lalu tahan. Dalam keadaan yang diperbesar ini, Anda dapat menyeret jari untuk menjelajah bagian layar yang berbeda. Angkat jari Anda untuk mengembalikan ke keadaan sebelumnya.\n\nCatatan: Ketukan tiga kali untuk pembesaran bekerja di mana pun kecuali pada keyboard dan bilah navigasi."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Pintasan aksesibilitas"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Aktif"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Mati"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Jika fitur ini diaktifkan, Anda dapat mengaktifkan fitur aksesibilitas dengan cepat dalam dua langkah:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Jika fitur ini diaktifkan, Anda dapat mengaktifkan fitur aksesibilitas dengan cepat dalam dua langkah:\n\nLangkah 1: Tekan terus tombol daya sampai terdengar suara atau terasa getaran.\n\nLangkah 2: Sentuh dan tahan dua jari sampai terdengar konfirmasi audio.\n\nJika perangkat memiliki beberapa pengguna, pintasan pada layar kunci ini dapat digunakan untuk mengaktifkan aksesibilitas sementara sampai perangkat terbuka kuncinya."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Teks besar"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Pembesaran layar"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Perbarui otomatis pembesaran layar"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack menyediakan masukan lisan untuk membantu pengguna yang buta dan tidak terlalu baik penglihatannya. Apakah Anda ingin memasangnya secara gratis dari Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Tidak tersedia deskripsi."</string>
     <string name="settings_button" msgid="3006713718908152930">"Setelan"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Pencetakan"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Setelan pencetakan"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Layanan"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> dapat menerima dokumen yang Anda cetak. Dokumen seperti itu dapat berisi data sensitif."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Tidak ada layanan terpasang"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Setelan"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Tambahkan printer"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Aktif"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Nonaktif"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterai"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Apa yang menggunakan daya baterai"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Data penggunaan baterai tidak tersedia."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi berjalan"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telepon"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Data terkirim"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Data diterima"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Data seluler terkirim"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Data seluler diterima"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Data Wi‑Fi terkirim"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Data Wi-Fi diterima"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Waktu hidup"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tinggi nada"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Mempengaruhi nada teks yang disampaikan"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Bahasa"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Bahasa tidak dipilih"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Menyetel suara spesifik bahasa untuk teks lisan"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Dengarkan contoh"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Putar demonstrasi singkat dari sintesis suara"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP tidak didukung."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Anda tidak dapat mengonfigurasi sambungan Wi-Fi EAP selama penyiapan. Setelah penyiapan, Anda dapat melakukannya di Setelan &gt; Nirkabel &amp; jaringan."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Menyambungkan membutuhkan waktu beberapa menit..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Sentuh "<b>"Berikutnya"</b>" untuk melanjutkan penyiapan."\n\n"Sentuh "<b>"Kembali"</b>" untuk menyambung ke jaringan Wi-Fi lain."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Sentuh "<b>"Berikutnya"</b>" untuk melanjutkan penyiapan.\n\nSentuh "<b>"Kembali"</b>" untuk menyambung ke jaringan Wi-Fi lain."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinkronisasi diaktifkan"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinkronisasi dinonaktifkan"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Kesalahan sinkronisasi."</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalender"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kontak"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Selamat datang di Google sync!"</font>" "\n"Pendekatan Google untuk menyinkronkan data guna memungkinkan akses ke kontak, janji temu, dan lain-lain dari mana saja."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Selamat datang di Google sync!"</font>" \nPendekatan Google untuk menyinkronkan data guna memungkinkan akses ke kontak, janji temu, dan lain-lain dari mana saja."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Setelan sinkronisasi apl"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data &amp; sinkronisasi"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Ubah sandi"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Debug overdraw oleh GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Nonaktifkan lapisan HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Selalu gunakan GPU untuk pengomposisian layar"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktifkan jejak OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Matikan data latar di jaringan seluler. Jika ada, pakai lainnya."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Untuk membatasi data latar belakang pada apl ini, setel batas data seluler terlebih dulu."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Batasi data latar belakang?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Fitur ini dapat menghentikan aplikasi yang bergantung pada data latar saat hanya ada jaringan seluler."\n\n"Anda dapat menemukan kontrol penggunaan data yang lebih sesuai dalam setelan yang tersedia dalam aplikasi."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Fitur ini dapat menghentikan aplikasi yang bergantung pada data latar saat hanya ada jaringan seluler.\n\nAnda dapat menemukan kontrol penggunaan data yang lebih sesuai dalam setelan yang tersedia dalam aplikasi."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Pembatasan data latar belakang hanya dimungkinkan bila Anda telah menyetel batas data seluler."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Aktifkan sinkronisasi data otomatis?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Semua perubahan yang dilakukan pada akun Anda di web akan disalin ke tablet Anda secara otomatis."\n\n"Beberapa akun juga dapat menyalin semua perubahan yang dilakukan di tablet ke web secara otomatis. Beginilah cara kerja Akun Google."\n\n"Untuk memilih jenis informasi yang akan disinkronkan dalam setiap akun, buka Setelan &gt; Akun."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Semua perubahan yang dilakukan pada akun Anda di web akan disalin ke ponsel Anda secara otomatis."\n\n"Beberapa akun juga dapat menyalin semua perubahan yang dilakukan di ponsel ke web secara otomatis. Beginilah cara kerja Akun Google."\n\n"Untuk memilih jenis informasi yang akan disinkronkan dalam setiap akun, buka Setelan &gt; Akun."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Semua perubahan yang dilakukan pada akun Anda di web akan disalin ke tablet Anda secara otomatis.\n\nBeberapa akun juga dapat menyalin semua perubahan yang dilakukan di tablet ke web secara otomatis. Beginilah cara kerja Akun Google.\n\nUntuk memilih jenis informasi yang akan disinkronkan dalam setiap akun, buka Setelan &gt; Akun."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Semua perubahan yang dilakukan pada akun Anda di web akan disalin ke ponsel Anda secara otomatis.\n\nBeberapa akun juga dapat menyalin semua perubahan yang dilakukan di ponsel ke web secara otomatis. Beginilah cara kerja Akun Google.\n\nUntuk memilih jenis informasi yang akan disinkronkan dalam setiap akun, buka Setelan &gt; Akun."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Nonaktifkan sinkronisasi data otomatis?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Hal ini akan menghemat penggunaan baterai dan data, tapi Anda perlu menyinkronkan setiap akun secara manual untuk mengumpulkan informasi terkini. Anda juga tidak akan menerima pemberitahuan ketika ada pembaruan."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tanggal penyetelan ulang daur penggunaan"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Setel peringatan penggunaan data"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Setel batas penggunaan data"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Membatasi penggunaan data"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Sambungan data seluler Anda akan dinonaktifkan ketika mencapai batas yang ditentukan."\n\n"Karena penggunaan data dihitung oleh tablet Anda, dan operator Anda mungkin menghitung penggunaan secara berbeda, pertimbangkan untuk menggunakan batas yang konservatif."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Sambungan data seluler Anda akan dinonaktifkan ketika mencapai batas yang ditentukan."\n\n"Karena penggunaan data dihitung oleh ponsel Anda, dan operator Anda mungkin menghitung penggunaan secara berbeda, pertimbangkan untuk menggunakan batas yang konservatif."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Sambungan data seluler Anda akan dinonaktifkan ketika mencapai batas yang ditentukan.\n\nKarena penggunaan data dihitung oleh tablet Anda, dan operator Anda mungkin menghitung penggunaan secara berbeda, pertimbangkan untuk menggunakan batas yang konservatif."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Sambungan data seluler Anda akan dinonaktifkan ketika mencapai batas yang ditentukan.\n\nKarena penggunaan data dihitung oleh ponsel Anda, dan operator Anda mungkin menghitung penggunaan secara berbeda, pertimbangkan untuk menggunakan batas yang konservatif."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Batasi data latar belakang?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Jika Anda membatasi data seluler latar belakang, beberapa aplikasi dan layanan tidak akan berfungsi kecuali jika Anda terhubung ke jaringan Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Jika Anda membatasi data seluler latar belakang, beberapa aplikasi dan layanan tidak akan berfungsi kecuali Anda terhubung ke jaringan Wi-Fi."\n\n"Setelan ini memengaruhi semua pengguna di tablet ini."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Jika Anda membatasi data seluler latar belakang, beberapa aplikasi dan layanan tidak akan berfungsi kecuali Anda terhubung ke jaringan Wi-Fi."\n\n"Setelan ini memengaruhi semua pengguna di ponsel ini."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Jika Anda membatasi data seluler latar belakang, beberapa aplikasi dan layanan tidak akan berfungsi kecuali Anda terhubung ke jaringan Wi-Fi.\n\nSetelan ini memengaruhi semua pengguna di tablet ini."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Jika Anda membatasi data seluler latar belakang, beberapa aplikasi dan layanan tidak akan berfungsi kecuali Anda terhubung ke jaringan Wi-Fi.\n\nSetelan ini memengaruhi semua pengguna di ponsel ini."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"peringatan"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="12">"batas"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Apl dihapus"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Pengguna"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil dibatasi"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Tambahkan pengguna baru"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Anda dapat berbagi perangkat ini bersama orang lain dengan membuat pengguna tambahan. Setiap pengguna memiliki ruangnya sendiri yang dapat disesuaikan dengan aplikasinya sendiri, wallpaper, dan sebagainya. Pengguna juga dapat menyesuaikan setelan tablet seperti Wi-Fi yang memengaruhi siapa saja."\n\n"Setelah Anda membuat pengguna baru, orang tersebut harus melakukan proses penyiapan."\n\n"Setiap pengguna dapat menerima izin aplikasi yang diperbarui atas nama semua pengguna lain."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"Setelah Anda membuat pengguna baru, orang tersebut perlu menjalani proses penyiapan."\n\n"Setiap pengguna dapat menerima izin aplikasi yang diperbarui atas nama semua pengguna lain."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Anda dapat berbagi perangkat ini bersama orang lain dengan membuat pengguna tambahan. Setiap pengguna memiliki ruangnya sendiri yang dapat disesuaikan dengan aplikasinya sendiri, wallpaper, dan sebagainya. Pengguna juga dapat menyesuaikan setelan tablet seperti Wi-Fi yang memengaruhi siapa saja.\n\nSetelah Anda membuat pengguna baru, orang tersebut harus melakukan proses penyiapan.\n\nSetiap pengguna dapat menerima izin aplikasi yang diperbarui atas nama semua pengguna lain."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Setelah Anda membuat pengguna baru, orang tersebut perlu menjalani proses penyiapan.\n\nSetiap pengguna dapat menerima izin aplikasi yang diperbarui atas nama semua pengguna lain."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Siapkan pengguna sekarang?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Pastikan orang tersebut tersedia untuk mengambil tablet dan menyiapkan ruangnya"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Siapkan profil sekarang?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Setelan ini memengaruhi semua pengguna di ponsel ini."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Ubah bahasa"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Ubah ukuran font"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Batasan"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Hapus batasan"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Ubah PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Tampilkan pemberitahuan"</string>
     <string name="help_label" msgid="1107174367904110532">"Bantuan"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Akun untuk konten"</string>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 8763dc4577f..f1d1469697a 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Posizione"</item>
     <item msgid="255608127647030286">"Personali"</item>
     <item msgid="4588829735729884491">"Messaggi"</item>
-    <item msgid="8971765125227378270">"Dispositivo"</item>
+    <item msgid="886742181977884584">"Contenuti multimediali"</item>
+    <item msgid="7924928667052300589">"Dispositivo"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"posizione approssimativa"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"riproduzione audio"</item>
     <item msgid="8374996688066472414">"lettura degli appunti"</item>
     <item msgid="3045529469061083747">"modifica degli appunti"</item>
+    <item msgid="5124443975763747838">"pulsanti contenuti multimediali"</item>
+    <item msgid="4547883971364273343">"focus audio"</item>
+    <item msgid="2603878814882344450">"volume principale"</item>
+    <item msgid="7136963238377062018">"volume voce"</item>
+    <item msgid="4270236897655923007">"volume suoneria"</item>
+    <item msgid="6325739889222559394">"volume contenuti multimediali"</item>
+    <item msgid="5762123934816216821">"volume allarme"</item>
+    <item msgid="785049718065337473">"volume notifiche"</item>
+    <item msgid="6700305533746877052">"volume bluetooth"</item>
+    <item msgid="2029227495214047094">"mantieni attivo"</item>
+    <item msgid="26109888160231211">"monitora posizione"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Posizione"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Riproduzione audio"</item>
     <item msgid="136815868796597058">"Lettura degli appunti"</item>
     <item msgid="5238692940326972503">"Modifica degli appunti"</item>
+    <item msgid="5753789168376302997">"Pulsanti contenuti multimediali"</item>
+    <item msgid="3265262911688671938">"Focus audio"</item>
+    <item msgid="2098976479485046797">"Volume principale"</item>
+    <item msgid="5660213838861789350">"Volume voce"</item>
+    <item msgid="7983336752371254444">"Volume suoneria"</item>
+    <item msgid="7878027809189330917">"Volume contenuti multimediali"</item>
+    <item msgid="7260546305036218513">"Volume allarme"</item>
+    <item msgid="9103719301075748925">"Volume notifiche"</item>
+    <item msgid="7025966722295861512">"Volume Bluetooth"</item>
+    <item msgid="4665183401128289653">"Mantieni attivo"</item>
+    <item msgid="8584357129746649222">"Posizione"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Breve"</item>
     <item msgid="2560532955514699713">"Medio"</item>
     <item msgid="2372711992605524591">"Lungo"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (debug)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Usa Dalvik"</item>
+    <item msgid="5131846588686178907">"Usa ART"</item>
+    <item msgid="4530003713865319928">"Usa la build di debug ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Non verificare mai"</item>
     <item msgid="6042769699089883931">"Verifica solo per contenuti DRM"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Su schermo sotto forma di linee"</item>
     <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Off"</item>
+    <item msgid="7688197031296835369">"Mostra aree overdraw"</item>
+    <item msgid="8332661909019981149">"Mostra contatore overdraw"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite standard"</item>
     <item msgid="4071574792028999443">"Nessun processo in background"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c04ac267ca2..42bad7db26d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Quando consenti il roaming dei dati, potrebbero essere addebitati costi significativi per il roaming.\n\nQuesta impostazione influisce su tutti gli utenti di questo tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Quando consenti il roaming dei dati, potrebbero essere addebitati costi significativi per il roaming.\n\nQuesta impostazione influisce su tutti gli utenti di questo telefono."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Consentire il roaming dei dati?"</string>
     <string name="networks" msgid="6333316876545927039">"Selezione operatore"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Scegli un operatore di rete"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Richiedi un PIN numerico o una password per decrittografare il tablet a ogni accensione"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Richiedi un PIN numerico o una password per decrittografare il telefono a ogni accensione"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Crittografato"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puoi crittografare i tuoi account, le impostazioni, le applicazioni scaricate e i relativi dati, file multimediali e altri file. Una volta crittografato il tablet, devi digitare un PIN numerico o una password per decrittografarlo ogni volta che lo accendi. Non puoi decrittografare il tablet se non eseguendo un ripristino dati di fabbrica, cancellando tutti i tuoi dati."\n\n"La crittografia potrebbe richiedere più di un\'ora. Devi iniziare con una batteria carica e tenere il tablet collegato fino al completamento della crittografia. Se interrompi la procedura, perderai alcuni o tutti i tuoi dati."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Puoi crittografare i tuoi account, le impostazioni, le applicazioni scaricate e i relativi dati, file multimediali e altri file. Una volta crittografato il telefono, devi digitare un PIN numerico o una password per decrittografarlo ogni volta che lo accendi. Non puoi decrittografare il telefono se non eseguendo un ripristino dati di fabbrica, cancellando tutti i tuoi dati."\n\n"La crittografia potrebbe richiedere più di un\'ora. Devi iniziare con una batteria carica e tenere il telefono collegato fino al completamento della crittografia. Se interrompi la procedura, perderai alcuni o tutti i tuoi dati."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puoi crittografare i tuoi account, le impostazioni, le applicazioni scaricate e i relativi dati, file multimediali e altri file. Una volta crittografato il tablet, devi digitare un PIN numerico o una password per decrittografarlo ogni volta che lo accendi. Non puoi decrittografare il tablet se non eseguendo un ripristino dati di fabbrica, cancellando tutti i tuoi dati.\n\nLa crittografia potrebbe richiedere più di un\'ora. Devi iniziare con una batteria carica e tenere il tablet collegato fino al completamento della crittografia. Se interrompi la procedura, perderai alcuni o tutti i tuoi dati."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Puoi crittografare i tuoi account, le impostazioni, le applicazioni scaricate e i relativi dati, file multimediali e altri file. Una volta crittografato il telefono, devi digitare un PIN numerico o una password per decrittografarlo ogni volta che lo accendi. Non puoi decrittografare il telefono se non eseguendo un ripristino dati di fabbrica, cancellando tutti i tuoi dati.\n\nLa crittografia potrebbe richiedere più di un\'ora. Devi iniziare con una batteria carica e tenere il telefono collegato fino al completamento della crittografia. Se interrompi la procedura, perderai alcuni o tutti i tuoi dati."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Esegui crittografia tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Esegui crittografia telefono"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carica la batteria e riprova."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Riprova tra <xliff:g id="DELAY">^1</xliff:g> secondi."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Digita la password"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Crittografia non riuscita"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul tablet non sono più accessibili. "\n\n"Per riprendere a utilizzare il tablet devi effettuare un ripristino dei dati di fabbrica. Quando configuri il tablet dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo account Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul telefono non sono più accessibili. "\n\n"Per riprendere a utilizzare il telefono devi effettuare il ripristino dei dati di fabbrica. Quando configuri il telefono dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo account Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul tablet non sono più accessibili. \n\nPer riprendere a utilizzare il tablet devi effettuare un ripristino dei dati di fabbrica. Quando configuri il tablet dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo account Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul telefono non sono più accessibili. \n\nPer riprendere a utilizzare il telefono devi effettuare il ripristino dei dati di fabbrica. Quando configuri il telefono dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo account Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Cambia metodo di immissione"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Scegli blocco schermo"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Scegli blocco di backup"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Collegamento in corso"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Connesso"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponibile"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"In uso"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Impostazioni di visualizzazione"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Disconnettere?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Questa operazione terminerà la connessione con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Non attivo"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Non disponibile perché la tecnologia NFC non è attiva"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Quando questa funzione è attiva, puoi trasferire contenuti di applicazioni su un altro dispositivo che supporta la tecnologia NFC tenendo vicini i due dispositivi. Puoi trasferire, ad esempio, pagine dell\'applicazione Browser, video di YouTube, contatti di Persone e altri dati."\n\n"È sufficiente avvicinare i dispositivi (generalmente mettendo a contatto le due parti posteriori), quindi toccare lo schermo. L\'applicazione stabilisce i dati da trasferire."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Quando questa funzione è attiva, puoi trasferire contenuti di applicazioni su un altro dispositivo che supporta la tecnologia NFC tenendo vicini i due dispositivi. Puoi trasferire, ad esempio, pagine dell\'applicazione Browser, video di YouTube, contatti di Persone e altri dati.\n\nÈ sufficiente avvicinare i dispositivi (generalmente mettendo a contatto le due parti posteriori), quindi toccare lo schermo. L\'applicazione stabilisce i dati da trasferire."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Rilevamento servizi di rete"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Consenti alle applicazioni su altri dispositivi di scoprire applicazioni su questo dispositivo"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protetta con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protetta con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nessuna"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Per migliorare la precisione della posizione e per altri scopi, <xliff:g id="APP_NAME">%1$s</xliff:g> chiede di attivare la ricerca della rete, anche quando il Wi-Fi è disattivato."\n\n"Consetirlo a tutte le app che vogliono eseguire la ricerca?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Per migliorare la precisione della posizione e per altri scopi, <xliff:g id="APP_NAME">%1$s</xliff:g> chiede di attivare la ricerca della rete, anche quando il Wi-Fi è disattivato.\n\nConsetirlo a tutte le app che vogliono eseguire la ricerca?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Consenti"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Rifiuta"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connetti"</string>
@@ -632,8 +633,8 @@
     <string name="wifi_cancel" msgid="6763568902542968964">"Annulla"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"Ignora comunque"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Non saltare"</string>
-    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"AVVISO. Potresti incorrere in addebiti extra dell\'operatore per i dati."\n\n"La configurazione del tablet può richiedere notevole attività di rete."</string>
-    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AVVISO. Potresti incorrere in addebiti extra dell\'operatore per i dati."\n\n"La configurazione del telefono può richiedere notevole attività di rete."</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"AVVISO. Potresti incorrere in addebiti extra dell\'operatore per i dati.\n\nLa configurazione del tablet può richiedere notevole attività di rete."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AVVISO. Potresti incorrere in addebiti extra dell\'operatore per i dati.\n\nLa configurazione del telefono può richiedere notevole attività di rete."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"AVVISO. Finché non disporrai di una connessione Internet, il tablet non sarà in grado di verificare che il software sia aggiornato."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"AVVISO. Finché non disporrai di una connessione Internet, il telefono non sarà in grado di verificare che il software sia aggiornato."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Impossibile collegare il tablet alla rete Wi‑Fi."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN della SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN errato"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"I PIN non corrispondono"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Impossibile cambiare il PIN."\n"Il PIN potrebbe essere errato."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Impossibile cambiare il PIN.\nIl PIN potrebbe essere errato."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN della SIM modificato"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Impossibile modificare lo stato di blocco della scheda SIM."\n"Il PIN potrebbe essere errato."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Impossibile modificare lo stato di blocco della scheda SIM.\nIl PIN potrebbe essere errato."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Annulla"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stato tablet"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Ripristino dati di fabbrica"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Cancella tutti i dati sul tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Cancella tutti i dati sul telefono"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Questa operazione cancellerà tutti i dati memorizzati nell\'"<b>"archivio interno"</b>" del tablet, compresi:"\n\n<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle applicazioni"</li>\n<li>"Applicazioni scaricate"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Questa operazione cancellerà tutti i dati memorizzati nell\'"<b>"archivio interno"</b>" del telefono, compresi:"\n\n<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle applicazioni"</li>\n<li>"Applicazioni scaricate"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Al momento sei collegato ai seguenti account:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Questa operazione cancellerà tutti i dati memorizzati nell\'"<b>"archivio interno"</b>" del tablet, compresi:\n\n"<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle applicazioni"</li>\n<li>"Applicazioni scaricate"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Questa operazione cancellerà tutti i dati memorizzati nell\'"<b>"archivio interno"</b>" del telefono, compresi:\n\n"<li>"Il tuo account Google"</li>\n<li>"Dati e impostazioni del sistema e delle applicazioni"</li>\n<li>"Applicazioni scaricate"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Al momento sei collegato ai seguenti account:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musica"</li>\n<li>"Foto"</li>\n<li>"Altri dati utente"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Per cancellare musica, foto e altri dati dell\'utente, è necessario cancellare i dati dell\'"<b>"archivio USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Per cancellare musica, foto e altri dati dell\'utente, è necessario cancellare i dati della "<b>"scheda SD"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Mostra processi nella cache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Reimposta preferenze app"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Reimpostare preferenze app?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"L\'operazione consentirà di reimpostare tutte le preferenze per:"\n\n" "<li>"App disattivate"</li>\n" "<li>"Notifiche di app disattivate"</li>\n" "<li>"App predefinite per determinate azioni"</li>\n" "<li>"Limitazioni sui dati in background per le app"</li>\n\n" I dati delle app non andranno persi."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"L\'operazione consentirà di reimpostare tutte le preferenze per:\n\n "<li>"App disattivate"</li>\n" "<li>"Notifiche di app disattivate"</li>\n" "<li>"App predefinite per determinate azioni"</li>\n" "<li>"Limitazioni sui dati in background per le app"</li>\n\n" I dati delle app non andranno persi."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Reimposta app"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gestisci spazio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtra"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Cambia premendo Ctrl-Barra spaziatr."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predefinita"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Layout tastiera"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dizionario utente"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dizionario personale"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Dizionari personali"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Dizionario personale"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Aggiungi"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Aggiungi al dizionario"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Includi opzione per aprire una segnalazione bug nel menu di accensione"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Rimani attivo"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Lo schermo non va mai in stand-by se sotto carica"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Attiva log di esame HCI Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Acquisisci tutti i pacchetti HCI Bluetooth in un file"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Seleziona runtime"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Seleziona runtime"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Riavviare per modificare runtime da <xliff:g id="OLD">%1$s</xliff:g> a <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Posizioni fittizie"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Consenti posizioni fittizie"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Consentire debug USB?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Proteggi archivio USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Le app devono richiedere l\'autorizzazione per leggere l\'archivio USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Proteggere l\'archivio USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Quando l\'archivio USB è protetto, le applicazioni devono richiedere l\'autorizzazione per leggere i dati dalla memoria esterna."\n\n"Alcune applicazioni potrebbero non funzionare fino all\'aggiornamento da parte dei relativi sviluppatori."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Quando l\'archivio USB è protetto, le applicazioni devono richiedere l\'autorizzazione per leggere i dati dalla memoria esterna.\n\nAlcune applicazioni potrebbero non funzionare fino all\'aggiornamento da parte dei relativi sviluppatori."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Proteggi scheda SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Le app devono richiedere l\'autorizzazione per leggere la scheda SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Proteggere la scheda SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Quando la scheda SD è protetta, le applicazioni devono richiedere l\'autorizzazione per leggere i dati dalla memoria esterna."\n\n"Alcune applicazioni potrebbero non funzionare fino all\'aggiornamento da parte dei relativi sviluppatori."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Quando la scheda SD è protetta, le applicazioni devono richiedere l\'autorizzazione per leggere i dati dalla memoria esterna.\n\nAlcune applicazioni potrebbero non funzionare fino all\'aggiornamento da parte dei relativi sviluppatori."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminale locale"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Abilita l\'app Terminale che offre l\'accesso alla shell locale"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Scegli gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Scegli widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Creare il widget e consentire l\'accesso?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Servizi"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gesti di ingrandimento"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Quando questa funzione è attiva puoi aumentare e diminuire lo zoom toccando tre volte lo schermo."\n\n"Dopo avere aumentato lo zoom puoi:"\n<ul><li>"Eseguire una panoramica: trascina due o più dita sullo schermo."</li>\n<li>"Regolare il livello di zoom: unisci due o più dita come per fare un pizzicotto o allontanale."</li></ul>\n\n"Puoi anche ingrandire temporaneamente l\'area su cui hai il dito toccando tre volte e tenendo premuto. Nello stato ingrandito puoi trascinare il dito per esaminare parti diverse dello schermo. Solleva il dito per tornare allo stato precedente."\n\n"Nota. Il tocco triplo per ingrandire funziona ovunque tranne che per la tastiera e la barra di navigazione."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Quando questa funzione è attiva puoi aumentare e diminuire lo zoom toccando tre volte lo schermo.\n\nDopo avere aumentato lo zoom puoi:\n"<ul><li>"Eseguire una panoramica: trascina due o più dita sullo schermo."</li>\n<li>"Regolare il livello di zoom: unisci due o più dita come per fare un pizzicotto o allontanale."</li></ul>\n\n"Puoi anche ingrandire temporaneamente l\'area su cui hai il dito toccando tre volte e tenendo premuto. Nello stato ingrandito puoi trascinare il dito per esaminare parti diverse dello schermo. Solleva il dito per tornare allo stato precedente.\n\nNota. Il tocco triplo per ingrandire funziona ovunque tranne che per la tastiera e la barra di navigazione."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Collegamento Accessibilità"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Attiva"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Disattivato"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Quando questa funzione è attiva, puoi attivare rapidamente le funzioni di accessibilità in due passaggi:"\n\n"Passaggio 1. Premi e tieni premuto il tasto di accensione fino all\'emissione di un suono o una vibrazione."\n\n"Passaggio 2. Tocca con due dita e tieni premuto finché senti un suono di conferma."\n\n"Se sul dispositivo sono configurati più utenti e utilizzi questa scorciatoia nella schermata di blocco, l\'accessibilità viene attivata temporaneamente fino allo sblocco del dispositivo."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Quando questa funzione è attiva, puoi attivare rapidamente le funzioni di accessibilità in due passaggi:\n\nPassaggio 1. Premi e tieni premuto il tasto di accensione fino all\'emissione di un suono o una vibrazione.\n\nPassaggio 2. Tocca con due dita e tieni premuto finché senti un suono di conferma.\n\nSe sul dispositivo sono configurati più utenti e utilizzi questa scorciatoia nella schermata di blocco, l\'accessibilità viene attivata temporaneamente fino allo sblocco del dispositivo."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Testo grande"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ingrandimento schermo"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Aggiorn. autom. ingrandim. schermo"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack fornisce commenti vocali per utenti non vedenti o con problemi di vista. Vuoi installare gratuitamente l\'applicazione da Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nessuna descrizione fornita."</string>
     <string name="settings_button" msgid="3006713718908152930">"Impostazioni"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Stampa"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Impostazioni di stampa"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Servizi"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utilizzare <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> può ricevere i documenti stampati. Tali documenti potrebbero contenere dati riservati."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Nessun servizio installato"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Impostazioni"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Aggiungi stampanti"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Attiva"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Non attiva"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Consumo batteria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Dati uso batteria non disp."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi‑Fi attivo"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefono"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Dati inviati"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Dati ricevuti"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Dati mobili inviati"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Dati mobili ricevuti"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Dati Wi-Fi inviati"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Dati Wi-Fi ricevuti"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tempo in attività"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tono"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Interessa il tono del testo parlato"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Lingua"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Lingua non selezionata"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Imposta la voce specifica della lingua per il testo parlato"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Ascolta un esempio"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Riproduci una breve dimostrazione della sintesi vocale"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP non è supportato."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Impossibile configurare una connessione Wi‑Fi EAP durante l\'impostazione. Dopo l\'impostazione potrai configurarla nella sezione Impostazioni &gt; Wireless e reti."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"La connessione può richiedere qualche minuto..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Tocca "<b>"Avanti"</b>" per continuare con la configurazione."\n\n"Tocca "<b>"Indietro"</b>" per connetterti a un\'altra rete Wi‑Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Tocca "<b>"Avanti"</b>" per continuare con la configurazione.\n\nTocca "<b>"Indietro"</b>" per connetterti a un\'altra rete Wi‑Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronizzazione abilitata"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronizzazione disabilata"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Errore di sincronizzazione."</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Calendario"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Contatti"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Benvenuto in Google Sync."</font>" "\n"L\'approccio di Google alla sincronizzazione di dati per consentirti l\'accesso ai tuoi contatti, appuntamenti e altro ancora, ovunque tu sia."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Benvenuto in Google Sync."</font>" \nL\'approccio di Google alla sincronizzazione di dati per consentirti l\'accesso ai tuoi contatti, appuntamenti e altro ancora, ovunque tu sia."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Impostazioni sincronizzazione applicazioni"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dati e sincronizzazione"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Cambia password"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Debug overdraw GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Disabilita overlay HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Usa sempre GPU per la composizione dello schermo"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Attiva tracce OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Disattiva dati in background su reti mobili. Reti non mobili usate se disponibili."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Per limitare i dati in background, imposta un limite dati mobili."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Limitare i dati in background?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Questa funzione può causare l\'interruzione del funzionamento di un\'applicazione che dipende dai dati in background quando sono disponibili solo le reti mobili."\n\n"Puoi trovare controlli di utilizzo dei dati più appropriati nelle impostazioni disponibili all\'interno dell\'applicazione."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Questa funzione può causare l\'interruzione del funzionamento di un\'applicazione che dipende dai dati in background quando sono disponibili solo le reti mobili.\n\nPuoi trovare controlli di utilizzo dei dati più appropriati nelle impostazioni disponibili all\'interno dell\'applicazione."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"La limitazione dei dati in background è possibile solo se hai impostato un limite per i dati mobili."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Attivare sincr. autom. dati?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Tutte le modifiche che apporti ai tuoi account sul Web verranno automaticamente copiate sul tablet."\n\n"Alcuni account potrebbero inoltre copiare automaticamente sul Web tutte le modifiche che apporti sul tablet. Gli account Google funzionano in questo modo."\n\n"Per scegliere quali tipi di informazioni sincronizzare all\'interno di ogni account, vai a Impostazioni &gt; Account."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Tutte le modifiche che apporti ai tuoi account sul Web verranno automaticamente copiate sul telefono."\n\n"Alcuni account potrebbero inoltre copiare automaticamente sul Web tutte le modifiche che apporti sul telefono. Gli account Google funzionano in questo modo."\n\n"Per scegliere quali tipi di informazioni sincronizzare all\'interno di ogni account, vai a Impostazioni &gt; Account."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Tutte le modifiche che apporti ai tuoi account sul Web verranno automaticamente copiate sul tablet.\n\nAlcuni account potrebbero inoltre copiare automaticamente sul Web tutte le modifiche che apporti sul tablet. Gli account Google funzionano in questo modo.\n\nPer scegliere quali tipi di informazioni sincronizzare all\'interno di ogni account, vai a Impostazioni &gt; Account."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Tutte le modifiche che apporti ai tuoi account sul Web verranno automaticamente copiate sul telefono.\n\nAlcuni account potrebbero inoltre copiare automaticamente sul Web tutte le modifiche che apporti sul telefono. Gli account Google funzionano in questo modo.\n\nPer scegliere quali tipi di informazioni sincronizzare all\'interno di ogni account, vai a Impostazioni &gt; Account."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Disattivare sincr. autom. dati?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"In questo modo limiterai l\'utilizzo di dati e della batteria, ma dovrai sincronizzare ciascun account manualmente per raccogliere le informazioni recenti. Inoltre non riceverai notifiche quando si verificano gli aggiornamenti."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data reimpostazione ciclo utilizzo"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Imposta avviso sull\'utilizzo dei dati"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Imposta limite di utilizzo dati"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitazione utilizzo dati"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"La tua connessione dati mobili verrà disattivata al raggiungimento del limite specificato."\n\n"Dato che l\'utilizzo dei dati è misurato dal tuo tablet e che il tuo operatore potrebbe tenere conto dell\'utilizzo in modo diverso, è consigliabile utilizzare un limite conservativo."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"La tua connessione dati mobili verrà disattivata al raggiungimento del limite specificato."\n\n"Dato che l\'utilizzo dei dati è misurato dal tuo telefono e che il tuo operatore potrebbe tenere conto dell\'utilizzo in modo diverso, è consigliabile utilizzare un limite conservativo."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"La tua connessione dati mobili verrà disattivata al raggiungimento del limite specificato.\n\nDato che l\'utilizzo dei dati è misurato dal tuo tablet e che il tuo operatore potrebbe tenere conto dell\'utilizzo in modo diverso, è consigliabile utilizzare un limite conservativo."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"La tua connessione dati mobili verrà disattivata al raggiungimento del limite specificato.\n\nDato che l\'utilizzo dei dati è misurato dal tuo telefono e che il tuo operatore potrebbe tenere conto dell\'utilizzo in modo diverso, è consigliabile utilizzare un limite conservativo."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Limitare i dati in background?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Se limiti i dati mobili in background, alcuni servizi e app non funzioneranno senza connessione a una rete Wi‑Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Se limiti i dati mobili in background, alcuni servizi e app non funzioneranno senza connessione a una rete Wi‑Fi."\n\n"Questa impostazione influisce su tutti gli utenti di questo tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Se limiti i dati mobili in background, alcuni servizi e app non funzioneranno senza connessione a una rete Wi‑Fi."\n\n"Questa impostazione influisce su tutti gli utenti di questo telefono."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Se limiti i dati mobili in background, alcuni servizi e app non funzioneranno senza connessione a una rete Wi‑Fi.\n\nQuesta impostazione influisce su tutti gli utenti di questo tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Se limiti i dati mobili in background, alcuni servizi e app non funzioneranno senza connessione a una rete Wi‑Fi.\n\nQuesta impostazione influisce su tutti gli utenti di questo telefono."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"avviso"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limite"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Applicazioni rimosse"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Utente"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profilo con limitazioni"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Aggiungi nuovo utente"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Puoi condividere il dispositivo con altre persone creando altri utenti. Ogni utente ha un proprio spazio personalizzabile con app, sfondo e così via. Gli utenti possono anche regolare le impostazioni del tablet, come il Wi‑Fi, che riguardano tutti."\n\n"Dopo la creazione di un nuovo utente, la persona in questione deve svolgere una procedura di configurazione."\n\n"Qualsiasi utente può accettare le autorizzazioni delle app aggiornate per conto di tutti gli altri utenti."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"Dopo la creazione di un nuovo utente, quella persona deve eseguire una procedura di configurazione."\n\n"Qualsiasi utente può accettare le autorizzazioni delle applicazioni aggiornate per conto di tutti gli altri utenti."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Puoi condividere il dispositivo con altre persone creando altri utenti. Ogni utente ha un proprio spazio personalizzabile con app, sfondo e così via. Gli utenti possono anche regolare le impostazioni del tablet, come il Wi‑Fi, che riguardano tutti.\n\nDopo la creazione di un nuovo utente, la persona in questione deve svolgere una procedura di configurazione.\n\nQualsiasi utente può accettare le autorizzazioni delle app aggiornate per conto di tutti gli altri utenti."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Dopo la creazione di un nuovo utente, quella persona deve eseguire una procedura di configurazione.\n\nQualsiasi utente può accettare le autorizzazioni delle applicazioni aggiornate per conto di tutti gli altri utenti."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurare l\'utente ora?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Assicurati che la persona possa utilizzare il tablet e configurare il suo spazio."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Configurare il profilo ora?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Questa impostazione influisce su tutti gli utenti di questo telefono."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Cambia lingua"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Cambia le dimensioni del carattere"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Limitazioni"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Rimuovi limitazioni"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Cambia PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostra notifiche"</string>
     <string name="help_label" msgid="1107174367904110532">"Guida"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Account per i contenuti"</string>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 63566bb275b..11e95a28641 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"מיקום"</item>
     <item msgid="255608127647030286">"אישי"</item>
     <item msgid="4588829735729884491">"העברת הודעות"</item>
-    <item msgid="8971765125227378270">"מכשיר"</item>
+    <item msgid="886742181977884584">"מדיה"</item>
+    <item msgid="7924928667052300589">"מכשיר"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"מיקום משוער"</item>
@@ -246,7 +247,7 @@
     <item msgid="6546959730920410907">"שנה יומן שיחות"</item>
     <item msgid="446877710771379667">"קרא יומן"</item>
     <item msgid="7674458294386319722">"שנה לוח שנה"</item>
-    <item msgid="8281201165558093009">"סריקת wi-fi"</item>
+    <item msgid="8281201165558093009">"סריקת Wi-Fi"</item>
     <item msgid="8694611243479480497">"התראה"</item>
     <item msgid="7776439107987345446">"סריקה סלולרית"</item>
     <item msgid="514615766544675057">"שיחת טלפון"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"הפעל את האודיו"</item>
     <item msgid="8374996688066472414">"קרא לוח"</item>
     <item msgid="3045529469061083747">"שנה לוח"</item>
+    <item msgid="5124443975763747838">"לחצני מדיה"</item>
+    <item msgid="4547883971364273343">"מיקוד אודיו"</item>
+    <item msgid="2603878814882344450">"שליטה ראשית בעוצמת קול"</item>
+    <item msgid="7136963238377062018">"עוצמת קול של דיבור"</item>
+    <item msgid="4270236897655923007">"עוצמת קול של צלצול"</item>
+    <item msgid="6325739889222559394">"עוצמת קול של מדיה"</item>
+    <item msgid="5762123934816216821">"עוצמת קול של התרעה"</item>
+    <item msgid="785049718065337473">"עוצמת קול של התראה"</item>
+    <item msgid="6700305533746877052">"עוצמת קול של Bluetooth"</item>
+    <item msgid="2029227495214047094">"שמור במצב פעיל"</item>
+    <item msgid="26109888160231211">"עקוב אחר מיקום"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"מיקום"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"הפעל את האודיו"</item>
     <item msgid="136815868796597058">"קרא לוח"</item>
     <item msgid="5238692940326972503">"שנה לוח"</item>
+    <item msgid="5753789168376302997">"לחצני מדיה"</item>
+    <item msgid="3265262911688671938">"מיקוד אודיו"</item>
+    <item msgid="2098976479485046797">"שליטה ראשית בעוצמת קול"</item>
+    <item msgid="5660213838861789350">"עוצמת קול של דיבור"</item>
+    <item msgid="7983336752371254444">"עוצמת קול של צלצול"</item>
+    <item msgid="7878027809189330917">"עוצמת קול של מדיה"</item>
+    <item msgid="7260546305036218513">"עוצמת קול של התראה"</item>
+    <item msgid="9103719301075748925">"עוצמת קול של התראות"</item>
+    <item msgid="7025966722295861512">"עוצמת קול של Bluetooth"</item>
+    <item msgid="4665183401128289653">"שמור במצב פעיל"</item>
+    <item msgid="8584357129746649222">"מיקום"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"קצר"</item>
     <item msgid="2560532955514699713">"בינוני"</item>
     <item msgid="2372711992605524591">"ארוך"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (ניקוי באגים)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"השתמש ב-Dalvik"</item>
+    <item msgid="5131846588686178907">"השתמש ב-ART"</item>
+    <item msgid="4530003713865319928">"השתמש ב-Build ניקוי הבאגים של ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"אל תבדוק לעולם"</item>
     <item msgid="6042769699089883931">"בדוק אם יש תוכן DRM בלבד"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"במסך כקווים"</item>
     <item msgid="120512413928262547">"ב-adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"כבוי"</item>
+    <item msgid="7688197031296835369">"הצגת אזורים עם חריגה"</item>
+    <item msgid="8332661909019981149">"הצגת מונה חריגות"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"הגבלת תקן"</item>
     <item msgid="4071574792028999443">"אין תהליכים ברקע"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 6014192424b..6f1f8b2e486 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -275,8 +275,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_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>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"דורש PIN מספרי או סיסמה לפענוח הטבלט בכל הפעלה"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"דורש PIN מספרי או סיסמה לפענוח הטלפון בכל הפעלה"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"מוצפן"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"אתה יכול להצפין חשבונות, הגדרות, יישומים שהורדת ונתונים שלהם, מדיה וקבצים אחרים. לאחר שתצפין את הטבלט שלך, בכל פעם שתפעיל אותו תצטרך להקליד קוד PIN מספרי או סיסמה כדי לפענח את הנתונים. לא תוכל לבטל את הצפנת הטבלט שלך, אלא אם תבצע איפוס לנתוני יצרן. פעולה זו תמחק את כל הנתונים."\n\n"ההצפנה אורכת שעה לפחות. עליך לבצע הפעלה עם סוללה טעונה ולהשאיר את הטבלט מחובר עד לסיום ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד את כל הנתונים או חלק מהם."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"אתה יכול להצפין חשבונות, הגדרות, יישומים שהורדת ונתונים שלהם, מדיה וקבצים אחרים. לאחר שתצפין את הטלפון שלך, בכל פעם שתפעיל אותו תצטרך להקליד קוד PIN מספרי או סיסמה כדי לפענח את הנתונים. לא תוכל לבטל את הצפנת הטלפון שלך, אלא אם תבצע איפוס לנתוני יצרן. פעולה זו תמחק את כל הנתונים."\n\n"ההצפנה אורכת שעה לפחות. עליך לבצע הפעלה עם סוללה טעונה ולהשאיר את הטלפון מחובר עד לסיום ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד את כל הנתונים או חלק מהם."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"אתה יכול להצפין חשבונות, הגדרות, יישומים שהורדת ונתונים שלהם, מדיה וקבצים אחרים. לאחר שתצפין את הטבלט שלך, בכל פעם שתפעיל אותו תצטרך להקליד קוד PIN מספרי או סיסמה כדי לפענח את הנתונים. לא תוכל לבטל את הצפנת הטבלט שלך, אלא אם תבצע איפוס לנתוני יצרן. פעולה זו תמחק את כל הנתונים.\n\nההצפנה אורכת שעה לפחות. עליך לבצע הפעלה עם סוללה טעונה ולהשאיר את הטבלט מחובר עד לסיום ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד את כל הנתונים או חלק מהם."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"אתה יכול להצפין חשבונות, הגדרות, יישומים שהורדת ונתונים שלהם, מדיה וקבצים אחרים. לאחר שתצפין את הטלפון שלך, בכל פעם שתפעיל אותו תצטרך להקליד קוד PIN מספרי או סיסמה כדי לפענח את הנתונים. לא תוכל לבטל את הצפנת הטלפון שלך, אלא אם תבצע איפוס לנתוני יצרן. פעולה זו תמחק את כל הנתונים.\n\nההצפנה אורכת שעה לפחות. עליך לבצע הפעלה עם סוללה טעונה ולהשאיר את הטלפון מחובר עד לסיום ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד את כל הנתונים או חלק מהם."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"הצפן טאבלט"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"הצפן טלפון"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"טען את הסוללה ונסה שוב."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"נסה שוב בעוד <xliff:g id="DELAY">^1</xliff:g> שניות."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"הקלד את הסיסמה שלך"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ההצפנה נכשלה"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"ההצפנה הופסקה ואין אפשרות להשלים אותה. בשל כך, לא ניתן עוד לגשת לנתונים בטבלט שלך. "\n\n"כדי לחזור ולהשתמש בטבלט, עליך לבצע איפוס נתוני יצרן. כאשר תגדיר את הטבלט לאחר האיפוס, תוכל לשחזר נתונים שגובו בחשבון Google שלך."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"ההצפנה הופסקה ואין אפשרות להשלים אותה. כתוצאה מכך, לא ניתן עוד לגשת לנתונים בטלפון שלך. "\n\n"כדי לחזור ולהשתמש בטלפון, עליך לבצע איפוס להגדרות היצרן. כאשר תגדיר את הטלפון לאחר האיפוס, תהיה לך הזדמנות לשחזר נתונים שגובו בחשבון Google שלך."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"ההצפנה הופסקה ואין אפשרות להשלים אותה. בשל כך, לא ניתן עוד לגשת לנתונים בטבלט שלך. \n\nכדי לחזור ולהשתמש בטבלט, עליך לבצע איפוס נתוני יצרן. כאשר תגדיר את הטבלט לאחר האיפוס, תוכל לשחזר נתונים שגובו בחשבון Google שלך."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"ההצפנה הופסקה ואין אפשרות להשלים אותה. כתוצאה מכך, לא ניתן עוד לגשת לנתונים בטלפון שלך. \n\nכדי לחזור ולהשתמש בטלפון, עליך לבצע איפוס להגדרות היצרן. כאשר תגדיר את הטלפון לאחר האיפוס, תהיה לך הזדמנות לשחזר נתונים שגובו בחשבון Google שלך."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"החלפת שיטת קלט"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"בחירת נעילת מסך"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"בחר נעילת גיבוי"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"מתחבר"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"מחובר"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"זמין"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"בשימוש"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"הגדרות תצוגה"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"להתנתק?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"פעולה זו תסיים את החיבור עם:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,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="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"מאובטח באמצעות <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", מאובטח באמצעות <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"ללא"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"לשיפור דיוק המיקום ולמטרות אחרות, <xliff:g id="APP_NAME">%1$s</xliff:g> רוצה להפעיל את סריקת הרשתות, גם כאשר ה-Wi-Fi כבוי."\n\n"האם להתיר זאת עבור כל היישומים שרוצים לסרוק?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"לשיפור דיוק המיקום ולמטרות אחרות, <xliff:g id="APP_NAME">%1$s</xliff:g> רוצה להפעיל את סריקת הרשתות, גם כאשר ה-Wi-Fi כבוי.\n\nהאם להתיר זאת עבור כל היישומים שרוצים לסרוק?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"אפשר"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"דחה"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"התחבר"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"אזהרה: הספק עלול לגבות עלויות נתונים נוספות.\n\nהגדרת טאבלט עשויה לצרוך פעילות רבה ברשת."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"אזהרה: הספק עלול לגבות עלויות נתונים נוספות.\n\nהגדרת טלפון עשויה לצרוך פעילות רבה ברשת."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"אזהרה: לפני שיהיה לך חיבור אינטרנט, הטאבלט לא יוכל לאמת שהתוכנה שלך עדכנית."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"אזהרה: לפני שיהיה לך חיבור אינטרנט, הטלפון לא יוכל לאמת שהתוכנה שלך עדכנית."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"הטאבלט לא הצליח להתחבר לרשת ה-Wi-Fi הזו."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN של SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN שגוי"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"קודי ה-PIN אינם תואמים"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"לא ניתן לשנות את קוד ה-PIN‏."\n"כנראה שקוד ה-PIN שגוי."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"לא ניתן לשנות את קוד ה-PIN‏.\nכנראה שקוד ה-PIN שגוי."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"ה-PIN של ה-SIM השתנה בהצלחה"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"לא ניתן לשנות את מצב הנעילה של כרטיס ה-SIM‏."\n"כנראה שקוד ה-PIN שגוי."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"לא ניתן לשנות את מצב הנעילה של כרטיס ה-SIM‏.\nכנראה שקוד ה-PIN שגוי."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"אישור"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ביטול"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"סטטוס טאבלט"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"איפוס נתוני יצרן"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"מוחק את כל הנתונים בטבלט"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"מחק את כל הנתונים בטלפון"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטבלט שלך, כולל:"\n\n<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והיישומים שלך"</li>\n<li>"היישומים שהורדת"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטלפון שלך, כולל:"\n\n<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והיישומים שלך"</li>\n<li>"היישומים שהורדת"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"אתה מחובר כעת לחשבונות הבאים:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטבלט שלך, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והיישומים שלך"</li>\n<li>"היישומים שהורדת"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטלפון שלך, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והיישומים שלך"</li>\n<li>"היישומים שהורדת"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"אתה מחובר כעת לחשבונות הבאים:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"מוסיקה"</li>\n<li>"תמונות"</li>\n<li>"נתוני משתמש אחרים"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"כדי למחוק פריטי מוסיקה, תמונות ונתוני משתמש אחרים, יש למחוק את "<b>"אחסון ה-USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"כדי למחוק פריטי מוסיקה, תמונות ונתוני משתמש אחרים, יש למחוק את "<b>"כרטיס ה-SD"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"הצג תהליכים המאוחסנים בקובץ שמור"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"אפס העדפות יישום"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"האם לאפס העדפות יישום?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"פעולה זו תאפס את כל ההעדפות עבור:"\n\n" "<li>"יישומים מושבתים"</li>\n" "<li>"התראות יישום מושבת"</li>\n" "<li>"יישומי ברירת מחדל לפעולות"</li>\n" "<li>"הגבלות נתוני רקע ליישומים"</li>\n\n" לא תאבד נתוני יישומים."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"פעולה זו תאפס את כל ההעדפות עבור:\n\n "<li>"יישומים מושבתים"</li>\n" "<li>"התראות יישום מושבת"</li>\n" "<li>"יישומי ברירת מחדל לפעולות"</li>\n" "<li>"הגבלות נתוני רקע ליישומים"</li>\n\n" לא תאבד נתוני יישומים."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"אפס יישומים"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"נהל שטח אחסון"</string>
     <string name="filter" msgid="2018011724373033887">"סינון"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"כדי להחליף פריסה, הקש Control-מקש רווח"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"ברירת מחדל"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"פריסות מקלדת"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"מילון משתמש"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"מילון אישי"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"מילונים אישיים"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"מילון אישי"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"הוסף"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"הוסף למילון"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"כלול אפשרות ב-Power Menu לביצוע דיווח על באג"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"השאר פועל"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"המסך לעולם לא יהיה במצב שינה במהלך טעינה"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"הפעלת Snoop Log של Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"אחד את כל חבילות Bluetooth HCI בקובץ"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"בחירת זמן ריצה"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"בחירת זמן ריצה"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"האם לאתחל על מנת לשנות את זמן הריצה מ-<xliff:g id="OLD">%1$s</xliff:g> ל-<xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"אפשר מיקומים מדומים"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"אפשר מיקומים מדומים"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"לאפשר ניקוי באגים של USB?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"הגנה על אחסון USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"על יישומים לבקש רשות כדי לקרוא אחסון USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"האם להגן על אחסון USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"כאשר אחסון USB מוגן, על יישומים לבקש רשות כדי לקרוא נתונים מאחסון חיצוני."\n\n"ייתכן שיישומים מסוימים לא יפעלו עד שיעודכנו על ידי המפתחים שלהם."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"כאשר אחסון USB מוגן, על יישומים לבקש רשות כדי לקרוא נתונים מאחסון חיצוני.\n\nייתכן שיישומים מסוימים לא יפעלו עד שיעודכנו על ידי המפתחים שלהם."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"הגנה על כרטיס SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"על יישומים לבקש רשות כדי לקרוא כרטיס SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"האם להגן על כרטיס ה-SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"כאשר כרטיס ה-SD מוגן, על יישומים לבקש רשות כדי לקרוא נתונים מאחסון חיצוני."\n\n"ייתכן שיישומים מסוימים לא יפעלו עד שיעודכנו על ידי המפתחים שלהם."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"כאשר כרטיס ה-SD מוגן, על יישומים לבקש רשות כדי לקרוא נתונים מאחסון חיצוני.\n\nייתכן שיישומים מסוימים לא יפעלו עד שיעודכנו על ידי המפתחים שלהם."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"מסוף מקומי"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"הפעל יישום מסוף המציע גישה מקומית למעטפת"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"בחר גאדג\'ט"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"בחר Widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"האם ליצור Widget‏ ולאפשר גישה?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"שירותים"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"מערכת"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"תנועות לשינוי גודל"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"כשתכונה זו מופעלת, ניתן להתקרב ולהתרחק באמצעות הקשה משולשת על המסך."\n\n"בזמן שההצגה מוגדלת ניתן:"\n<ul><li>"להזיז לצדדים: גרור שתי אצבעות או יותר לאורך המסך."</li>\n<li>"לשנות את מידת ההגדלה: עשה תנועת צביטה באמצעות שתי אצבעות או הרחק אותן אחת מהשנייה."</li></ul>\n\n"ניתן גם להגדיל באופן זמני את הפריט שמתחת לאצבע על ידי הקשה משולשת והחזקה. במצב הגדלה זה ניתן לגרור את האצבע על מנת להציג כך חלקים שונים במסך. הרם את האצבע כדי לחזור למצב הקודם."\n\n"שים לב: הקשה משולשת להגדלה פועלת בכל מקום מלבד במקלדת ובסרגל הניווט."</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_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>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack מספק משוב מוקרא בקול רם כדי לעזור למשתמשים עיוורים ולקויי ראייה. האם ברצונך להתקין אותו ללא תשלום מ\'חנות Android\'?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"לא סופק תיאור."</string>
     <string name="settings_button" msgid="3006713718908152930">"הגדרות"</string>
+    <string name="print_settings" msgid="4742428530112487843">"הדפסה"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"הגדרות הדפסה"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"שירותים"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"האם להשתמש ב-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> יכול לקבל מסמכים שאתה מדפיס. מסמכים כאלה עשויים להכיל נתונים רגישים."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"אין שירותים מותקנים"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"הגדרות"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"הוסף מדפסות"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"פועל"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"כבוי"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"סוללה"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"מה השתמש בסוללה"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"אין נתונים זמינים על השימוש בסוללה."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi פועל"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"טאבלט"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"טלפון"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"הנתונים נשלחו"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"הנתונים התקבלו"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"נתונים לנייד נשלחו"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"נתונים לנייד התקבלו"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"נתוני Wi‑Fi נשלחו"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"נתוני Wi‑Fi התקבלו"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"אודיו"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Google וידאו"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"משך פעולה עד כה"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"גובה צליל"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"משפיע על הטון של הטקסט הנאמר"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"שפה"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"לא נבחרה שפה"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"מגדיר קול ספציפי לשפה עבור הטקסט הנאמר"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"האזן לדוגמה"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"הפעל הדגמה קצרה של סינתזת דיבור"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"אין תמיכה ב-EAP."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"אין אפשרות להגדיר חיבור Wi-Fi של EAP במהלך ההגדרה. לאחר ההגדרה, תוכל לעשות זאת ב\'הגדרות\' &gt; \'רשתות ותקשורת אלחוטית\'."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"ההתחברות עשויה להימשך מספר דקות..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"גע ב"<b>"הבא"</b>" כדי להמשיך בהגדרה."\n\n"גע ב"<b>"הקודם"</b>" כדי להתחבר לרשת Wi-Fi אחרת."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"גע ב"<b>"הבא"</b>" כדי להמשיך בהגדרה.\n\nגע ב"<b>"הקודם"</b>" כדי להתחבר לרשת Wi-Fi אחרת."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"הסינכרון מופעל"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"הסינכרון מושבת"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"שגיאת סינכרון"</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"יומן Google"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"אנשי קשר"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"ברוכים הבאים אל סינכרון Google‏!"</font>" "\n"זוהי גישה של Google לסינכרון נתונים במטרה לאפשר לך גישה לאנשי קשר, לפגישות ועוד מכל מקום שבו אתה נמצא."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"ברוכים הבאים אל סינכרון Google‏!"</font>" \nזוהי גישה של Google לסינכרון נתונים במטרה לאפשר לך גישה לאנשי קשר, לפגישות ועוד מכל מקום שבו אתה נמצא."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"הגדרות סנכרון יישומים"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"נתונים וסינכרון"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"שנה סיסמה"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"חריגה בניקוי באגים ב-GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"השבת שכבות על של HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"השתמש תמיד ב-GPU להרכבת מסך"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"הפעל מעקבי OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"השבת נתוני רקע ברשתות לנייד. ייעשה שימוש ברשתות שאינן לנייד, אם יהיו זמינות."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"כדי להגביל נתוני רקע עבור יישום זה, הגדר תחילה מגבלת נתונים לנייד."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"להגביל נתוני רקע?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"תכונה זו עלולה לגרום ליישום התלוי בנתוני רקע להפסיק לפעול כאשר רק רשתות לנייד זמינות."\n\n"ניתן למצוא אמצעים מתאימים יותר לבקרת השימוש בנתונים דרך ההגדרות הזמינות ביישום."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"תכונה זו עלולה לגרום ליישום התלוי בנתוני רקע להפסיק לפעול כאשר רק רשתות לנייד זמינות.\n\nניתן למצוא אמצעים מתאימים יותר לבקרת השימוש בנתונים דרך ההגדרות הזמינות ביישום."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"הגבלת נתוני הרקע אפשרית רק אם הגדרת מגבלת נתונים לנייד."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"האם להפעיל סנכרון אוטומטי של נתונים?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"שינויים כלשהם שתבצע בחשבונך באינטרנט יועתקו אוטומטית אל הטאבלט."\n\n"חשבונות מסוימים עשויים גם להעתיק אוטומטית אל האינטרנט שינויים שאתה מבצע בטאבלט. חשבון Google פועל בצורה כזאת."\n\n"כדי לבחור את סוגי הפרטים שיסונכרנו בכל חשבון, עבור אל \'הגדרות\' &gt; \'חשבונות\'."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"שינויים כלשהם שתבצע בחשבונך באינטרנט יועתקו אוטומטית אל הטלפון."\n\n"חשבונות מסוימים עשויים גם להעתיק אוטומטית אל האינטרנט שינויים שאתה מבצע בטלפון. חשבון Google פועל בצורה כזאת."\n\n"כדי לבחור את סוגי הפרטים שיסונכרנו בכל חשבון, עבור אל \'הגדרות\' &gt; \'חשבונות\'."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"שינויים כלשהם שתבצע בחשבונך באינטרנט יועתקו אוטומטית אל הטאבלט.\n\nחשבונות מסוימים עשויים גם להעתיק אוטומטית אל האינטרנט שינויים שאתה מבצע בטאבלט. חשבון Google פועל בצורה כזאת.\n\nכדי לבחור את סוגי הפרטים שיסונכרנו בכל חשבון, עבור אל \'הגדרות\' &gt; \'חשבונות\'."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"שינויים כלשהם שתבצע בחשבונך באינטרנט יועתקו אוטומטית אל הטלפון.\n\nחשבונות מסוימים עשויים גם להעתיק אוטומטית אל האינטרנט שינויים שאתה מבצע בטלפון. חשבון Google פועל בצורה כזאת.\n\nכדי לבחור את סוגי הפרטים שיסונכרנו בכל חשבון, עבור אל \'הגדרות\' &gt; \'חשבונות\'."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"האם לכבות סנכרון אוטומטי של נתונים?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"פעולה זו תחסוך בשימוש בנתונים ובעוצמת סוללה, אך יהיה עליך לסנכרן כל חשבון באופן ידני על מנת לאסוף מידע עדכני. לא תקבל התראות כאשר יתרחשו עדכונים."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"תאריך איפוס של מחזור שימוש"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"הגדר אזהרת שימוש בנתונים"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"הגדר מגבלת שימוש בנתונים"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"הגבלת שימוש בנתונים"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"חיבור הנתונים שלך בנייד יושבת כאשר תגיע למגבלה שצוינה."\n\n"מכיוון שנפח העברת הנתונים נמדד על ידי הטאבלט, ומכיוון שייתכן שספק השירות שלך מחשב את נפח העברת הנתונים אחרת, מומלץ להשתמש במגבלה שמרנית."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"חיבור הנתונים שלך בנייד יושבת כאשר תגיע למגבלה שצוינה."\n\n"מכיוון שנפח העברת הנתונים נמדד על ידי הטלפון, ומכיוון שייתכן שספק השירות שלך מחשב את נפח העברת הנתונים אחרת, מומלץ להשתמש במגבלה שמרנית."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"חיבור הנתונים שלך בנייד יושבת כאשר תגיע למגבלה שצוינה.\n\nמכיוון שנפח העברת הנתונים נמדד על ידי הטאבלט, ומכיוון שייתכן שספק השירות שלך מחשב את נפח העברת הנתונים אחרת, מומלץ להשתמש במגבלה שמרנית."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"חיבור הנתונים שלך בנייד יושבת כאשר תגיע למגבלה שצוינה.\n\nמכיוון שנפח העברת הנתונים נמדד על ידי הטלפון, ומכיוון שייתכן שספק השירות שלך מחשב את נפח העברת הנתונים אחרת, מומלץ להשתמש במגבלה שמרנית."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"להגביל נתוני רקע?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"אם תגביל נתונים לנייד ברקע, יישומים ושירותים מסוימים לא יפעלו, אלא אם קיים חיבור Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"אם תגביל נתונים לנייד ברקע, יישומים ושירותים מסוימים לא יפעלו, אלא אם אתה מחובר לרשת Wi-Fi‏."\n\n"הגדרה זו משפיעה על כל המשתמשים בטאבלט הזה."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"אם תגביל נתונים לנייד ברקע, יישומים ושירותים מסוימים לא יפעלו, אלא אם אתה מחובר לרשת Wi-Fi‏."\n\n"הגדרה זו משפיעה על כל המשתמשים בטלפון הזה."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"אם תגביל נתונים לנייד ברקע, יישומים ושירותים מסוימים לא יפעלו, אלא אם אתה מחובר לרשת Wi-Fi‏.\n\nהגדרה זו משפיעה על כל המשתמשים בטאבלט הזה."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"אם תגביל נתונים לנייד ברקע, יישומים ושירותים מסוימים לא יפעלו, אלא אם אתה מחובר לרשת Wi-Fi‏.\n\nהגדרה זו משפיעה על כל המשתמשים בטלפון הזה."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"אזהרה"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"מגבלה"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"יישומים שהוסרו"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"משתמש"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"פרופיל מוגבל"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"הוסף משתמש חדש"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"ניתן לשתף את המכשיר הזה עם אנשים אחרים על ידי יצירת משתמשים נוספים. לכל משתמש יש שטח משלו שהוא יכול להתאים אישית עם יישומים, טפט וכן הלאה. משתמשים יכולים גם להתאים את הגדרות הטאבלט, כגון Wi-Fi, שמשפיעות על כולם."\n\n"לאחר יצירת משתמש חדש, עליו לבצע תהליך הגדרה."\n\n"כל משתמש יכול לקבל הרשאות יישום מעודכנות בשם כל המשתמשים האחרים."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"לאחר יצירת משתמש חדש, עליו לבצע תהליך הגדרה."\n\n"כל משתמש יכול לקבל הרשאות יישום מעודכנות בשם כל המשתמשים האחרים."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"ניתן לשתף את המכשיר הזה עם אנשים אחרים על ידי יצירת משתמשים נוספים. לכל משתמש יש שטח משלו שהוא יכול להתאים אישית עם יישומים, טפט וכן הלאה. משתמשים יכולים גם להתאים את הגדרות הטאבלט, כגון Wi-Fi, שמשפיעות על כולם.\n\nלאחר יצירת משתמש חדש, עליו לבצע תהליך הגדרה.\n\nכל משתמש יכול לקבל הרשאות יישום מעודכנות בשם כל המשתמשים האחרים."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"לאחר יצירת משתמש חדש, עליו לבצע תהליך הגדרה.\n\nכל משתמש יכול לקבל הרשאות יישום מעודכנות בשם כל המשתמשים האחרים."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"האם להגדיר משתמש עכשיו?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"ודא שהאדם זמין לקחת את הטאבלט ולהגדיר את השטח שלו"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"האם להגדיר פרופיל עכשיו?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"הגדרה זו משפיעה על כל המשתמשים בטלפון הזה."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"שנה שפה"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"שנה גודל גופן"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"הגבלות"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"הסר הגבלות"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"שנה PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"הצג התראות"</string>
     <string name="help_label" msgid="1107174367904110532">"עזרה"</string>
     <string name="user_account_title" msgid="1127193807312271167">"חשבון לתוכן"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 21f877df2a8..f2b40b2f1d0 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"位置情報"</item>
     <item msgid="255608127647030286">"プライベート"</item>
     <item msgid="4588829735729884491">"メッセージ"</item>
-    <item msgid="8971765125227378270">"端末"</item>
+    <item msgid="886742181977884584">"メディア"</item>
+    <item msgid="7924928667052300589">"端末"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"おおよその位置情報"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"音声の再生"</item>
     <item msgid="8374996688066472414">"クリップボードの読み取り"</item>
     <item msgid="3045529469061083747">"クリップボードの変更"</item>
+    <item msgid="5124443975763747838">"メディアボタン"</item>
+    <item msgid="4547883971364273343">"音声フォーカス"</item>
+    <item msgid="2603878814882344450">"主音量"</item>
+    <item msgid="7136963238377062018">"音声の音量"</item>
+    <item msgid="4270236897655923007">"着信音の音量"</item>
+    <item msgid="6325739889222559394">"メディアの音量"</item>
+    <item msgid="5762123934816216821">"アラームの音量"</item>
+    <item msgid="785049718065337473">"通知音量"</item>
+    <item msgid="6700305533746877052">"Bluetoothの音量"</item>
+    <item msgid="2029227495214047094">"スリープモードにしない"</item>
+    <item msgid="26109888160231211">"場所を監視"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"位置情報"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"音声の再生"</item>
     <item msgid="136815868796597058">"クリップボードの読み取り"</item>
     <item msgid="5238692940326972503">"クリップボードの変更"</item>
+    <item msgid="5753789168376302997">"メディアボタン"</item>
+    <item msgid="3265262911688671938">"音声フォーカス"</item>
+    <item msgid="2098976479485046797">"主音量"</item>
+    <item msgid="5660213838861789350">"音声の音量"</item>
+    <item msgid="7983336752371254444">"着信音の音量"</item>
+    <item msgid="7878027809189330917">"メディアの音量"</item>
+    <item msgid="7260546305036218513">"アラームの音量"</item>
+    <item msgid="9103719301075748925">"通知の音量"</item>
+    <item msgid="7025966722295861512">"Bluetoothの音量"</item>
+    <item msgid="4665183401128289653">"スリープモードにしない"</item>
+    <item msgid="8584357129746649222">"場所"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短め"</item>
     <item msgid="2560532955514699713">"中"</item>
     <item msgid="2372711992605524591">"長め"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART（デバッグ）"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Dalvikを使用"</item>
+    <item msgid="5131846588686178907">"ARTを使用"</item>
+    <item msgid="4530003713865319928">"ARTデバッグビルドを使用"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"チェックしない"</item>
     <item msgid="6042769699089883931">"DRMコンテンツのみをチェック"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"行として画面に表示"</item>
     <item msgid="120512413928262547">"adb shell dumpsys gfxinfoを使用"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"OFF"</item>
+    <item msgid="7688197031296835369">"オーバードロー領域の表示"</item>
+    <item msgid="8332661909019981149">"オーバードローカウンタの表示"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"標準の上限"</item>
     <item msgid="4071574792028999443">"バックグラウンドプロセスを使用しない"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 8bb0b0a11fe..8b55f93874f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -277,8 +277,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_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>
@@ -324,8 +324,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"電源を入れるたびに数値のPINまたはパスワードを入力してタブレットを復号化する必要がある"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"電源を入れるたびに数値のPINまたはパスワードを入力して端末を復号化する必要がある"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"暗号化されています"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"アカウント、設定、ダウンロードしたアプリとそのデータ、メディアなどのファイルを暗号化できます。タブレットを一度暗号化すると、電源を入れるたびに数値のPINまたはパスワードを入力して復号化する必要があります。暗号化を解除するためには、タブレットを出荷時設定にリセットしてすべてのデータを消去しなければなりません。"\n\n"暗号化には1時間以上かかります。開始する前に完全に充電し、暗号化が完了するまで電源を接続しておく必要があります。暗号化処理を中断すると、一部またはすべてのデータが失われます。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"アカウント、設定、ダウンロードしたアプリとそのデータ、メディアなどのファイルを暗号化できます。端末を一度暗号化すると、電源を入れるたびに数値のPINまたはパスワードを入力して復号化する必要があります。暗号化を解除するためには、端末を出荷時設定にリセットしてすべてのデータを消去しなければなりません。"\n\n"暗号化には1時間以上かかります。開始する前に完全に充電し、暗号化が完了するまで電源を接続しておく必要があります。暗号化処理を中断すると、一部またはすべてのデータが失われます。"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"アカウント、設定、ダウンロードしたアプリとそのデータ、メディアなどのファイルを暗号化できます。タブレットを一度暗号化すると、電源を入れるたびに数値のPINまたはパスワードを入力して復号化する必要があります。暗号化を解除するためには、タブレットを出荷時設定にリセットしてすべてのデータを消去しなければなりません。\n\n暗号化には1時間以上かかります。開始する前に完全に充電し、暗号化が完了するまで電源を接続しておく必要があります。暗号化処理を中断すると、一部またはすべてのデータが失われます。"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"アカウント、設定、ダウンロードしたアプリとそのデータ、メディアなどのファイルを暗号化できます。端末を一度暗号化すると、電源を入れるたびに数値のPINまたはパスワードを入力して復号化する必要があります。暗号化を解除するためには、端末を出荷時設定にリセットしてすべてのデータを消去しなければなりません。\n\n暗号化には1時間以上かかります。開始する前に完全に充電し、暗号化が完了するまで電源を接続しておく必要があります。暗号化処理を中断すると、一部またはすべてのデータが失われます。"</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"タブレットを暗号化"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"携帯端末を暗号化"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"充電してからもう一度お試しください。"</string>
@@ -341,8 +341,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g>秒後にやり直してください。"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"パスワードを入力してください"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"暗号化できませんでした"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"暗号化処理が中断されて完了できなかったためタブレット上のデータにアクセスできなくなりました。"\n\n"タブレットの使用を再開するには出荷時設定にリセットする必要があります。リセット後、タブレットのセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"暗号化処理が中断されて完了できなかったため端末上のデータにアクセスできなくなりました。"\n\n"端末の使用を再開するには出荷時設定にリセットする必要があります。リセット後、端末のセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"暗号化処理が中断されて完了できなかったためタブレット上のデータにアクセスできなくなりました。\n\nタブレットの使用を再開するには出荷時設定にリセットする必要があります。リセット後、タブレットのセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"暗号化処理が中断されて完了できなかったため端末上のデータにアクセスできなくなりました。\n\n端末の使用を再開するには出荷時設定にリセットする必要があります。リセット後、端末のセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。"</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"入力方法の切り替え"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"画面ロックを選択"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"バックアップのロックの選択"</string>
@@ -516,6 +516,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"接続中"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"接続済み"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"使用可能"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"使用中"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"ディスプレイの設定"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"切断しますか？"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"この操作を行うと、次のデバイスとの接続が切断されます:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -534,7 +535,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"OFF"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFCがOFFのため使用できません"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Androidビーム"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"この機能をONにすると、別のNFC対応の端末を近づけて持ち、アプリのコンテンツをビームすることができます。たとえば、ブラウザのページ、YouTubeの動画、連絡帳の連絡先などをビームできます。"\n\n"2 つの端末を近づけて（通常は背面を向かい合わせにして）、画面をタップします。何をビームするかはアプリが判断します。"</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"この機能をONにすると、別のNFC対応の端末を近づけて持ち、アプリのコンテンツをビームすることができます。たとえば、ブラウザのページ、YouTubeの動画、連絡帳の連絡先などをビームできます。\n\n2 つの端末を近づけて（通常は背面を向かい合わせにして）、画面をタップします。何をビームするかはアプリが判断します。"</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"ネットワークサービスの検出"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"別の端末上のアプリにこの端末上のアプリを検出することを許可する"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -622,7 +623,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>で保護"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"、<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>で保護"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"なし"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"現在地情報の精度向上やその他の目的で、<xliff:g id="APP_NAME">%1$s</xliff:g>ではWi-FiがOFFのときでもネットワークスキャンをオンにすることを要求しています。"\n\n"スキャンを必要とするすべてのアプリでスキャンを許可しますか？"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"現在地情報の精度向上やその他の目的で、<xliff:g id="APP_NAME">%1$s</xliff:g>ではWi-FiがOFFのときでもネットワークスキャンをオンにすることを要求しています。\n\nスキャンを必要とするすべてのアプリでスキャンを許可しますか？"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"許可する"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"許可しない"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"接続"</string>
@@ -634,8 +635,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"警告: 追加のデータ通信料が発生する可能性があります。\n\nタブレットのセットアップでは大量のネットワーク処理が必要となる場合があります。"</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"警告: 追加のデータ通信料が発生する可能性があります。\n\nタブレットのセットアップでは大量のネットワーク処理が必要となる場合があります。"</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"警告: インターネットに接続しないと、タブレットはソフトウェアが最新であることを確認できません。"</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"警告: インターネットに接続しないと、携帯端末はソフトウェアが最新であることを確認できません。"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"タブレットからこのWi-Fiネットワークに接続できませんでした。"</string>
@@ -775,9 +776,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PINが正しくありません"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PINが一致しません"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"PINを変更できません。"\n"PINが正しくない可能性があります。"</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"PINを変更できません。\nPINが正しくない可能性があります。"</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PINが変更されました"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"SIMカードのロック状態を変更できません。"\n"PINが正しくない可能性があります。"</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"SIMカードのロック状態を変更できません。\nPINが正しくない可能性があります。"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"キャンセル"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"タブレットの状態"</string>
@@ -920,9 +921,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"データの初期化"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"タブレット内のすべてのデータを消去する"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"携帯端末内のすべてのデータを消去する"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"この操作を行うと、タブレットの以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます:"\n\n<li>"Googleアカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"この操作を行うと、携帯端末の以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます:"\n\n<li>"Googleアカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"以下のアカウントにログインしています:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"この操作を行うと、タブレットの以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます:\n\n"<li>"Googleアカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"この操作を行うと、携帯端末の以下のデータを含む"<b>"内部ストレージ"</b>"の全データが消去されます:\n\n"<li>"Googleアカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"以下のアカウントにログインしています:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音楽"</li>\n<li>"画像"</li>\n<li>"他のユーザーデータ"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"音楽、画像、その他のユーザーデータを消去する場合は"<b>"USBストレージデータ"</b>"を消去する必要があります。"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"音楽、画像、その他のユーザーデータを消去するには、"<b>"SDカード"</b>"を消去する必要があります。"</string>
@@ -1107,7 +1108,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"キャッシュしたプロセスを表示"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"アプリの設定をリセット"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"設定をリセットしますか？"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"この操作により、次の設定がすべてリセットされます:"\n\n" "<li>"無効化されているアプリ"</li>\n" "<li>"無効化されているアプリの通知"</li>\n" "<li>"特定の操作で使用するデフォルトのアプリ"</li>\n" "<li>"アプリのバックグラウンドデータの制限"</li>\n\n" アプリのデータが失われることはありません。"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"この操作により、次の設定がすべてリセットされます:\n\n "<li>"無効化されているアプリ"</li>\n" "<li>"無効化されているアプリの通知"</li>\n" "<li>"特定の操作で使用するデフォルトのアプリ"</li>\n" "<li>"アプリのバックグラウンドデータの制限"</li>\n\n" アプリのデータが失われることはありません。"</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"アプリをリセット"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"容量を管理"</string>
     <string name="filter" msgid="2018011724373033887">"フィルタ"</string>
@@ -1242,9 +1243,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"切り替えるにはCtrl+スペースを押します"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"デフォルト"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"キーボードレイアウト"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"単語リスト"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"ユーザー辞書"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"ユーザー辞書"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"ユーザー辞書"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"追加"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"辞書に追加"</string>
@@ -1305,6 +1304,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"電源メニューにバグレポートを取得するオプションを含める"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"スリープモードにしない"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充電中に画面をスリープにしない"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCIスヌープログを有効にする"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Bluetooth HCIパケットをすべてファイルにキャプチャする"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"ランタイムを選択"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"ランタイムを選択"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"再起動して、ランタイムを<xliff:g id="OLD">%1$s</xliff:g>から<xliff:g id="NEW">%2$s</xliff:g>に変更しますか？"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"擬似ロケーションを許可"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"擬似ロケーションを許可する"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USBデバッグを許可しますか？"</string>
@@ -1317,11 +1321,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USBストレージの保護"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"アプリによるUSBストレージの読み取り権限のリクエストが必要"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"USBストレージの保護"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"USBストレージが保護されている場合、アプリは外部ストレージからデータを読み取る権限をリクエストする必要があります。"\n\n"一部のアプリについては、デベロッパーによって更新されるまで動作しない可能性があります。"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"USBストレージが保護されている場合、アプリは外部ストレージからデータを読み取る権限をリクエストする必要があります。\n\n一部のアプリについては、デベロッパーによって更新されるまで動作しない可能性があります。"</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"SDカードの保護"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"アプリによるSDカードの読み取り権限のリクエストが必要"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SDカードの保護"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SDカードが保護されている場合、アプリは外部ストレージからデータを読み取る権限をリクエストする必要があります。"\n\n"一部のアプリについては、デベロッパーによって更新されるまで動作しない可能性があります。"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SDカードが保護されている場合、アプリは外部ストレージからデータを読み取る権限をリクエストする必要があります。\n\n一部のアプリについては、デベロッパーによって更新されるまで動作しない可能性があります。"</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"ローカルターミナル"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"ローカルシェルアクセスを提供するターミナルアプリを有効にします"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"ガジェットを選択"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"ウィジェットを選択"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"ウィジェットの作成とアクセスの許可"</string>
@@ -1342,11 +1348,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"サービス"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"システム"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"拡大操作"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"この機能をオンにすると、画面をトリプルタップして画面を拡大/縮小できます。"\n\n"拡大した画面で次のことを実行できます:"\n<ul><li>"パン: 2本以上の指で画面上をドラッグします。"</li>\n<li>"拡大レベルの調整: 2本以上の指でピンチイン/ピンチアウトします。"</li></ul>\n\n"また、トリプルタップして押し続けると、指の下の部分を一時的に拡大することができます。この状態で、指をドラッグして画面の別の部分に移動することができます。指を画面から離すと元の状態に戻ります。"\n\n"注意: トリプルタップで拡大する方法は、キーボードとナビゲーションバー以外で使用できます。"</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_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>
@@ -1368,6 +1374,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Talkbackは音声で応答するアプリで、目の不自由なユーザーや低視力のユーザーを支援します。Androidマーケットから無料でインストールできます。"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"説明はありません。"</string>
     <string name="settings_button" msgid="3006713718908152930">"設定"</string>
+    <string name="print_settings" msgid="4742428530112487843">"印刷"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"印刷設定"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"サービス"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g>を利用しますか？"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>は印刷したドキュメントを受け取ることができます。このようなドキュメントは機密データが含まれている可能性があります。"</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"インストールされているサービスはありません"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"設定"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"プリンタを追加"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"ON"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"OFF"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"電池"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"電池の使用状況"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"電池使用量データがありません。"</string>
@@ -1407,8 +1423,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi使用"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"タブレット"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"電話"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"送信されたデータ"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"受信したデータ"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"送信したモバイルデータ"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"受信したモバイルデータ"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"送信したWi‑Fiデータ"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"受信したWi‑Fiデータ"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"音声"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"動画"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"点灯時間"</string>
@@ -1462,6 +1480,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"音の高さ"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"テキスト読み上げの音程を変更する"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"言語"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"言語が選択されていません"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"テキスト読み上げに使用する言語固有の音声を設定する"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"サンプルを再生"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"音声合成の短いサンプルを再生する"</string>
@@ -1600,7 +1619,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAPはサポートされていません。"</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"EAP Wi-Fi接続はセットアップ時に設定できません。セットアップの完了後に[設定]の[無線とネットワーク]で設定することができます。"</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"接続には数分かかることがあります..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"セットアップを続けるには["<b>"次へ"</b>"]をタップします。"\n\n"別のWi-Fiネットワークに接続するには["<b>"戻る"</b>"]をタップします。"</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"セットアップを続けるには["<b>"次へ"</b>"]をタップします。\n\n別のWi-Fiネットワークに接続するには["<b>"戻る"</b>"]をタップします。"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"同期が有効です"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"同期は無効になっています"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"同期エラー。"</string>
@@ -1682,8 +1701,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"GPUオーバードローをデバッグ"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HWオーバーレイを無効"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"画面合成に常にGPUを使用する"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGLトレースを有効化"</string>
@@ -1744,11 +1762,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"モバイルネットワークでバックグラウンドデータを無効にし、可能な場合はモバイル以外を使用。"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"このアプリのバックグラウンドデータを制限するには、最初にモバイルデータの上限を設定してください。"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"バックグラウンドデータを制限しますか？"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"この機能をONにすると、モバイルネットワークしか使用できない場合にバックグラウンドデータに依存するアプリが停止する可能性があります。"\n\n"データ使用をより適切に管理できるオプションがアプリの設定画面にないかどうかを確認してください。"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"この機能をONにすると、モバイルネットワークしか使用できない場合にバックグラウンドデータに依存するアプリが停止する可能性があります。\n\nデータ使用をより適切に管理できるオプションがアプリの設定画面にないかどうかを確認してください。"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"バックグラウンドデータを制限できるのは、モバイルデータの上限が設定済みの場合のみです。"</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"データ自動同期をONにしますか？"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"ウェブでアカウントに変更を加えると自動的にタブレットに反映されます。"\n\n"Googleアカウントなど、アカウントによっては、タブレットで変更を加えた場合も自動的にウェブに反映されます。"\n\n"各アカウント内で同期する情報の種類は[設定]&gt;[アカウント]で選択できます。"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"ウェブでアカウントに変更を加えると自動的に携帯端末に反映されます。"\n\n"Googleアカウントなど、アカウントによっては、携帯端末で変更を加えた場合も自動的にウェブに反映されます。"\n\n"各アカウント内で同期する情報の種類は[設定]&gt;[アカウント]で選択できます。"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"ウェブでアカウントに変更を加えると自動的にタブレットに反映されます。\n\nGoogleアカウントなど、アカウントによっては、タブレットで変更を加えた場合も自動的にウェブに反映されます。\n\n各アカウント内で同期する情報の種類は[設定]&gt;[アカウント]で選択できます。"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"ウェブでアカウントに変更を加えると自動的に携帯端末に反映されます。\n\nGoogleアカウントなど、アカウントによっては、携帯端末で変更を加えた場合も自動的にウェブに反映されます。\n\n各アカウント内で同期する情報の種類は[設定]&gt;[アカウント]で選択できます。"</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"データ自動同期をOFFにしますか？"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"無効にすると、データと電池の使用を節約できますが、最新情報を取得するには手動で各アカウントを同期する必要があります。また、更新があったときに通知されません。"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"使用サイクルのリセット日"</string>
@@ -1757,12 +1775,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"データ使用の警告の設定"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"データ使用の上限の設定"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"データ使用上限の設定"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"モバイルデータ接続は指定の制限に達した場合無効になります。"\n\n"データ利用はタブレットで記録されますが、携帯通信会社の利用明細は異なる可能性があるため、制限にできるだけ余裕をみておくことをおすすめします。"</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"モバイルデータ接続は指定の制限に達した場合無効になります。"\n\n"データ利用は携帯端末で記録されますが、携帯通信会社の利用明細は異なる可能性があるため、制限にできるだけ余裕をみておくことをおすすめします。"</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"モバイルデータ接続は指定の制限に達した場合無効になります。\n\nデータ利用はタブレットで記録されますが、携帯通信会社の利用明細は異なる可能性があるため、制限にできるだけ余裕をみておくことをおすすめします。"</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"モバイルデータ接続は指定の制限に達した場合無効になります。\n\nデータ利用は携帯端末で記録されますが、携帯通信会社の利用明細は異なる可能性があるため、制限にできるだけ余裕をみておくことをおすすめします。"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"バックグラウンドデータを制限しますか？"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"バックグラウンドのモバイルデータを制限すると、アプリやサービスによっては、Wi-Fiネットワーク未接続時に機能しない場合があります。"</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"バックグラウンドのモバイルデータを制限すると、アプリやサービスによっては、Wi-Fiネットワーク未接続時に機能しない場合があります。"\n\n"この設定はこのタブレット上のすべてのユーザーに影響します。"</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"バックグラウンドのモバイルデータを制限すると、アプリやサービスによっては、Wi-Fiネットワーク未接続時に機能しない場合があります。"\n\n"この設定はこの端末上のすべてのユーザーに影響します。"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"バックグラウンドのモバイルデータを制限すると、アプリやサービスによっては、Wi-Fiネットワーク未接続時に機能しない場合があります。\n\nこの設定はこのタブレット上のすべてのユーザーに影響します。"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"バックグラウンドのモバイルデータを制限すると、アプリやサービスによっては、Wi-Fiネットワーク未接続時に機能しない場合があります。\n\nこの設定はこの端末上のすべてのユーザーに影響します。"</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"警告"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"に制限"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"削除したアプリケーション"</string>
@@ -1849,8 +1867,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"ユーザー"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"制限付きプロフィール"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"新しいユーザーを追加する"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"追加ユーザーを作成して、この端末を他のユーザーと共有できます。各ユーザーは各自のスペースを所有でき、アプリや壁紙などを使用してカスタマイズできます。Wi-Fiなど、すべてのユーザーに影響するタブレット設定を変更することもできます。"\n\n"新しいユーザーを作成したら、そのユーザーはセットアップ処理を完了する必要があります。"\n\n"すべてのユーザーは他のユーザーの代わりに更新されたアプリの許可を承認できます。"</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"新しいユーザーを作成したら、そのユーザーはセットアップ処理を完了する必要があります。"\n\n"すべてのユーザーは他のユーザーの代わりに更新されたアプリの許可を承認できます。"</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"追加ユーザーを作成して、この端末を他のユーザーと共有できます。各ユーザーは各自のスペースを所有でき、アプリや壁紙などを使用してカスタマイズできます。Wi-Fiなど、すべてのユーザーに影響するタブレット設定を変更することもできます。\n\n新しいユーザーを作成したら、そのユーザーはセットアップ処理を完了する必要があります。\n\nすべてのユーザーは他のユーザーの代わりに更新されたアプリの許可を承認できます。"</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"新しいユーザーを作成したら、そのユーザーはセットアップ処理を完了する必要があります。\n\nすべてのユーザーは他のユーザーの代わりに更新されたアプリの許可を承認できます。"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"ユーザーを今すぐセットアップ"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"ユーザーがタブレットを使って各自のスペースをセットアップできるよう確認してください"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"プロフィールを今すぐセットアップしますか？"</string>
@@ -1881,6 +1899,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"この設定はこの端末上のすべてのユーザーに影響します。"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"言語の変更"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"フォントサイズの変更"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"制限"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"制限を削除"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"PINを変更"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"通知を表示"</string>
     <string name="help_label" msgid="1107174367904110532">"ヘルプ"</string>
     <string name="user_account_title" msgid="1127193807312271167">"コンテンツのアカウント"</string>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index ab1d5f81c55..862e6285e01 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"위치"</item>
     <item msgid="255608127647030286">"개인"</item>
     <item msgid="4588829735729884491">"메시지"</item>
-    <item msgid="8971765125227378270">"기기"</item>
+    <item msgid="886742181977884584">"미디어"</item>
+    <item msgid="7924928667052300589">"기기"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"대략적 위치"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"오디오 재생"</item>
     <item msgid="8374996688066472414">"클립보드 읽기"</item>
     <item msgid="3045529469061083747">"클립보드 수정"</item>
+    <item msgid="5124443975763747838">"미디어 버튼"</item>
+    <item msgid="4547883971364273343">"오디오 포커스"</item>
+    <item msgid="2603878814882344450">"마스터 볼륨"</item>
+    <item msgid="7136963238377062018">"음성 볼륨"</item>
+    <item msgid="4270236897655923007">"벨소리 볼륨"</item>
+    <item msgid="6325739889222559394">"미디어 볼륨"</item>
+    <item msgid="5762123934816216821">"알람 볼륨"</item>
+    <item msgid="785049718065337473">"알림 볼륨"</item>
+    <item msgid="6700305533746877052">"블루투스 볼륨"</item>
+    <item msgid="2029227495214047094">"켜진 상태로 유지"</item>
+    <item msgid="26109888160231211">"위치 모니터링"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"위치"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"오디오 재생"</item>
     <item msgid="136815868796597058">"클립보드 읽기"</item>
     <item msgid="5238692940326972503">"클립보드 수정"</item>
+    <item msgid="5753789168376302997">"미디어 버튼"</item>
+    <item msgid="3265262911688671938">"오디오 포커스"</item>
+    <item msgid="2098976479485046797">"마스터 볼륨"</item>
+    <item msgid="5660213838861789350">"음성 볼륨"</item>
+    <item msgid="7983336752371254444">"벨소리 볼륨"</item>
+    <item msgid="7878027809189330917">"미디어 볼륨"</item>
+    <item msgid="7260546305036218513">"알람 볼륨"</item>
+    <item msgid="9103719301075748925">"알림 볼륨"</item>
+    <item msgid="7025966722295861512">"블루투스 볼륨"</item>
+    <item msgid="4665183401128289653">"켜진 상태로 유지"</item>
+    <item msgid="8584357129746649222">"위치"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"짧게"</item>
     <item msgid="2560532955514699713">"보통"</item>
     <item msgid="2372711992605524591">"길게"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART(디버그)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Dalvik 사용"</item>
+    <item msgid="5131846588686178907">"ART 사용"</item>
+    <item msgid="4530003713865319928">"ART 디버그 빌드 사용"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"확인 안함"</item>
     <item msgid="6042769699089883931">"DRM 콘텐츠만 확인"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"화면에 선으로 표시"</item>
     <item msgid="120512413928262547">"adb shell dumpsys gfxinfo에서 사용"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"OFF"</item>
+    <item msgid="7688197031296835369">"오버드로 영역 표시"</item>
+    <item msgid="8332661909019981149">"오버드로 카운터 표시"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"표준 제한"</item>
     <item msgid="4071574792028999443">"백그라운드 프로세스 없음"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 951fccd3bfc..656aacfcd66 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -275,8 +275,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_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>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"태블릿의 전원을 켤 때마다 암호 해독을 위해 숫자 PIN 또는 비밀번호 입력"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"휴대전화의 전원을 켤 때마다 암호 해독을 위해 숫자 PIN 또는 비밀번호 입력"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"암호화됨"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"계정, 설정, 다운로드된 애플리케이션과 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 태블릿을 암호화하면 전원을 켤 때마다 숫자 PIN 또는 비밀번호를 입력하여 암호를 해제해야 합니다. 초기화하여 모든 데이터를 삭제해야만 태블릿 암호화를 해제할 수 있습니다."\n\n"암호화에는 1시간 이상이 걸릴 수 있습니다. 충전된 배터리로 암호화를 시작하고 완료될 때까지 태블릿의 전원 연결을 해제하지 않아야 합니다. 암호화 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"계정, 설정, 다운로드된 애플리케이션과 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 휴대전화를 암호화하면 전원을 켤 때마다 숫자 PIN 또는 비밀번호를 입력하여 암호를 해제해야 합니다. 초기화하여 모든 데이터를 삭제해야만 휴대전화 암호화를 해제할 수 있습니다."\n\n"암호화에는 1시간 이상이 걸릴 수 있습니다. 충전된 배터리로 암호화를 시작하고 완료될 때까지 휴대전화의 전원 연결을 해제하지 않아야 합니다. 암호화 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"계정, 설정, 다운로드된 애플리케이션과 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 태블릿을 암호화하면 전원을 켤 때마다 숫자 PIN 또는 비밀번호를 입력하여 암호를 해제해야 합니다. 초기화하여 모든 데이터를 삭제해야만 태블릿 암호화를 해제할 수 있습니다.\n\n암호화에는 1시간 이상이 걸릴 수 있습니다. 충전된 배터리로 암호화를 시작하고 완료될 때까지 태블릿의 전원 연결을 해제하지 않아야 합니다. 암호화 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"계정, 설정, 다운로드된 애플리케이션과 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 휴대전화를 암호화하면 전원을 켤 때마다 숫자 PIN 또는 비밀번호를 입력하여 암호를 해제해야 합니다. 초기화하여 모든 데이터를 삭제해야만 휴대전화 암호화를 해제할 수 있습니다.\n\n암호화에는 1시간 이상이 걸릴 수 있습니다. 충전된 배터리로 암호화를 시작하고 완료될 때까지 휴대전화의 전원 연결을 해제하지 않아야 합니다. 암호화 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"태블릿 암호화"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"휴대전화 암호화"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"배터리를 충전한 다음 다시 시도하세요."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g>초 후에 다시 시도하세요."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"비밀번호 입력"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"암호화하지 못했습니다."</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"암호화가 중단되어 완료할 수 없습니다. 따라서 태블릿의 데이터에 더 이상 액세스할 수 없습니다. "\n\n" 태블릿을 다시 사용하려면 초기화해야 합니다. 초기화한 후 태블릿을 설정하면, Google 계정에 백업되어 있던 데이터를 복원할 수 있습니다."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"암호화가 중단되어 완료할 수 없습니다. 따라서 휴대전화의 데이터에 더 이상 액세스할 수 없습니다. "\n\n"휴대전화를 다시 사용하려면 초기화해야 합니다. 초기화한 후 휴대전화를 설정하면, Google 계정에 백업되어 있던 데이터를 복원할 수 있습니다."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"암호화가 중단되어 완료할 수 없습니다. 따라서 태블릿의 데이터에 더 이상 액세스할 수 없습니다. \n\n 태블릿을 다시 사용하려면 초기화해야 합니다. 초기화한 후 태블릿을 설정하면, Google 계정에 백업되어 있던 데이터를 복원할 수 있습니다."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"암호화가 중단되어 완료할 수 없습니다. 따라서 휴대전화의 데이터에 더 이상 액세스할 수 없습니다. \n\n휴대전화를 다시 사용하려면 초기화해야 합니다. 초기화한 후 휴대전화를 설정하면, Google 계정에 백업되어 있던 데이터를 복원할 수 있습니다."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"입력 방법 전환"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"화면 잠금 선택"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"백업 잠금 선택"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"연결 중"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"연결됨"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"사용 가능"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"사용 중"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"디스플레이 설정"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"연결을 해제하시겠습니까?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 연결이 끊어집니다."</string>
@@ -532,7 +533,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="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>(으)로 보안"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>(으)로 보안"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"없음"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"위치 정확성 개선 등의 목적으로 <xliff:g id="APP_NAME">%1$s</xliff:g>에서 Wi-Fi가 꺼져 있을 때에도 네트워크 검색을 사용하도록 설정하려 합니다."\n\n"검색하려는 모든 앱에 대해 이를 허용하시겠습니까?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"위치 정확성 개선 등의 목적으로 <xliff:g id="APP_NAME">%1$s</xliff:g>에서 Wi-Fi가 꺼져 있을 때에도 네트워크 검색을 사용하도록 설정하려 합니다.\n\n검색하려는 모든 앱에 대해 이를 허용하시겠습니까?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"허용"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"거부"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"연결"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"경고: 추가 이동통신 데이터 요금이 발생할 수 있습니다.\n\n태블릿 설정은 상당한 네트워크 활동을 요구할 수 있습니다."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"경고: 추가 이동통신 데이터 요금이 발생할 수 있습니다.\n\n휴대전화 설정은 상당한 네트워크 활동을 요구할 수 있습니다."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"경고: 인터넷에 연결되어 있어야 태블릿에서 소프트웨어의 최신 상태 여부를 확인할 수 있습니다."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"경고: 인터넷에 연결되어 있어야 휴대전화에서 소프트웨어의 최신 상태 여부를 확인할 수 있습니다."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"해당 태블릿으로 이 Wi-Fi 네트워크에 연결할 수 없습니다."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"잘못된 PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN이 일치하지 않음"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"PIN을 변경할 수 없습니다."\n"PIN이 잘못된 것 같습니다."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"PIN을 변경할 수 없습니다.\nPIN이 잘못된 것 같습니다."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN이 변경되었습니다."</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM 카드 잠금 상태를 변경할 수 없습니다."\n"PIN이 잘못된 것 같습니다."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM 카드 잠금 상태를 변경할 수 없습니다.\nPIN이 잘못된 것 같습니다."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"확인"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"취소"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"태블릿 상태"</string>
@@ -920,7 +921,7 @@
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"휴대전화의 모든 데이터 지우기"</string>
     <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"공장 초기화하면 태블릿의 "<b>"내부 저장소의 모든 데이터가 삭제됩니다."</b>\n\n<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
     <string name="master_clear_desc" product="default" msgid="9165016501623540228">"공장 초기화하면 휴대전화의 "<b>"내부 저장소의 모든 데이터가 삭제됩니다."</b>\n\n<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"현재 로그인한 계정:"\n</string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"현재 로그인한 계정:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"음악"</li>\n<li>"사진"</li>\n<li>"기타 사용자 데이터"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"음악이나 사진, 기타 사용자 데이터를 지우려면 "<b>"USB 저장소"</b>"를 삭제해야 합니다."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"음악이나 사진, 기타 사용자 데이터를 지우려면 "<b>"SD 카드"</b>"를 삭제해야 합니다."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"캐시된 프로세스 표시"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"앱 환경설정 재설정"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"앱 환경설정을 재설정하시겠습니까?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"이 작업을 수행하면 다음 환경설정이 모두 재설정됩니다."\n\n" "<li>"사용 중지된 앱"</li>\n" "<li>"사용 중지된 앱 알림"</li>\n" "<li>"작업을 수행할 때 사용하는 기본 애플리케이션"</li>\n" "<li>"앱에 대한 백그라운드 데이터 제한"</li>\n\n" 앱 데이터는 손실되지 않습니다."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"이 작업을 수행하면 다음 환경설정이 모두 재설정됩니다.\n\n "<li>"사용 중지된 앱"</li>\n" "<li>"사용 중지된 앱 알림"</li>\n" "<li>"작업을 수행할 때 사용하는 기본 애플리케이션"</li>\n" "<li>"앱에 대한 백그라운드 데이터 제한"</li>\n\n" 앱 데이터는 손실되지 않습니다."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"앱 재설정"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"공간 관리"</string>
     <string name="filter" msgid="2018011724373033887">"필터"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"전환하려면 Control-Spacebar를 누름"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"기본값"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"키보드 레이아웃"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"사용자 사전"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"개인 사전"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"개인 사전"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"개인 사전"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"추가"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"사전에 추가"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"전원 메뉴에 버그 신고 옵션 포함"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"켜진 상태로 유지"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"충전하는 동안 화면이 꺼지지 않음"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"블루투스 HCI 스누프 로그 사용"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"모든 블루투스 HCI 패킷을 하나의 파일에 캡처"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"런타임 선택"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"런타임 선택"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"다시 부팅하여 <xliff:g id="OLD">%1$s</xliff:g>에서 <xliff:g id="NEW">%2$s</xliff:g>(으)로 런타임을 변경하시겠습니까?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"모의 위치 허용"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"모의 위치 허용"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB 디버깅을 허용하시겠습니까?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USB 저장소 보호"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"USB 저장소를 읽으려면 앱이 권한을 요청해야함"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"USB 저장소를 보호하시겠습니까?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"USB 저장소를 보호하도록 설정한 경우 앱이 외부 저장소에서 데이터를 읽을 수 있는 권한을 요청해야 합니다."\n\n"일부 앱은 개발자가 업데이트할 때까지 작동하지 않을 수 있습니다."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"USB 저장소를 보호하도록 설정한 경우 앱이 외부 저장소에서 데이터를 읽을 수 있는 권한을 요청해야 합니다.\n\n일부 앱은 개발자가 업데이트할 때까지 작동하지 않을 수 있습니다."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"SD 카드 보호"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"SD카드를 읽으려면 앱이 권한을 요청해야함"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SD 카드를 보호하시겠습니까?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SD 카드를 보호하도록 설정한 경우 앱이 외부 저장소에서 데이터를 읽을 수 있는 권한을 요청해야 합니다."\n\n"일부 앱은 개발자가 업데이트할 때까지 작동하지 않을 수 있습니다."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SD 카드를 보호하도록 설정한 경우 앱이 외부 저장소에서 데이터를 읽을 수 있는 권한을 요청해야 합니다.\n\n일부 앱은 개발자가 업데이트할 때까지 작동하지 않을 수 있습니다."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"로컬 터미널"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"로컬 셸 액세스를 제공하는 터미널 앱 사용"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"가젯 선택"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"위젯 선택"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"위젯을 만들고 액세스를 허용하시겠습니까?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"서비스"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"시스템"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"확대 동작"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"이 기능을 사용하면 화면을 3번 탭하여 확대 및 축소할 수 있습니다."\n\n"화면을 확대한 상태에서 다음 작업을 수행할 수 있습니다."\n<ul><li>"이동: 화면에서 두 개 이상의 손가락을 드래그"</li>\n<li>"확대/축소 수준 조정: 두 개 이상의 손가락을 오므리거나 벌림"</li></ul>\n\n"또한 3번 탭한 상태를 유지하여 손가락 아래에 있는 항목을 일시적으로 확대할 수 있습니다. 확대한 상태에서 손가락을 드래그하여 화면의 다른 부분을 탐색할 수 있습니다. 손가락을 떼면 이전 상태로 돌아갑니다."\n\n"참고: 세 번 탭하여 확대 기능은 키보드와 탐색 바에서는 작동하지 않습니다."</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_global_gesture_preference_description" msgid="750438015254396963">"이 기능을 사용하면 다음 두 단계를 통해 접근성 기능을 빠르게 사용하도록 설정할 수 있습니다.\n\n1단계: 소리가 나거나 진동이 느껴질 때까지 전원 버튼을 길게 누릅니다.\n\n2단계: 확인음이 들릴 때까지 두 손가락으로 길게 터치합니다.\n\n기기를 여러 사용자가 사용하는 경우 잠금 화면에 있는 바로가기를 사용하여 기기가 잠길 때까지 임시적으로 접근성 기능을 사용하도록 설정할 수 있습니다."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"큰 텍스트"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"화면 확대"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"화면 확대 자동 업데이트"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack은 시각 장애인을 위한 음성 피드백을 제공합니다. Android 마켓에서 무료로 설치하시겠습니까?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"제공된 설명이 없습니다."</string>
     <string name="settings_button" msgid="3006713718908152930">"설정"</string>
+    <string name="print_settings" msgid="4742428530112487843">"인쇄"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"인쇄 설정"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"서비스"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용하시겠습니까?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"인쇄한 문서를 <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>에서 받을 수 있습니다. 이런 문서에는 민감한 데이터가 포함되어 있을 수 있습니다."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"설치된 서비스 없음"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"설정"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"프린터 추가"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"ON"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"OFF"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"배터리"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"배터리 사용 세부정보"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"배터리 사용 데이터가 없습니다."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi 실행 중"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"태블릿"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"휴대전화"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"보낸 데이터"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"수신된 데이터"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"모바일 데이터 전송"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"모바일 데이터 수신"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Wi‑Fi 데이터 전송"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Wi‑Fi 데이터 수신"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"오디오"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"동영상"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"사용 시간"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"피치"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"발음된 텍스트의 톤에 적용"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"언어"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"언어가 선택되지 않음"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"발음된 텍스트에 대해 언어별로 음성 설정"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"예제 듣기"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"짧은 음성 합성 데모 재생"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP는 지원되지 않습니다."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"설정하는 동안에는 EAP Wi-Fi 연결을 구성할 수 없습니다. 설정한 후에 설정 &gt; 무선 및 네트워크에서 구성할 수 있습니다."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"연결 시 몇 분 정도 걸릴 수 있습니다."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"설정을 계속하려면 "<b>"다음"</b>"을 터치하세요."\n\n"다른 Wi-Fi 네트워크에 연결하려면 "<b>"뒤로"</b>"를 터치하세요."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"설정을 계속하려면 "<b>"다음"</b>"을 터치하세요.\n\n다른 Wi-Fi 네트워크에 연결하려면 "<b>"뒤로"</b>"를 터치하세요."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"동기화 사용"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"동기화 사용중지됨"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"동기화 오류입니다."</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"캘린더"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"연락처"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Google 동기화에 오신 것을 환영합니다."</font>" "\n"Google 동기화는 사용자가 어디에서든지 연락처, 일정 등에 액세스할 수 있도록 데이터를 동기화하는 Google 서비스입니다."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Google 동기화에 오신 것을 환영합니다."</font>" \nGoogle 동기화는 사용자가 어디에서든지 연락처, 일정 등에 액세스할 수 있도록 데이터를 동기화하는 Google 서비스입니다."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"앱 동기화 설정"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"데이터 및 동기화"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"비밀번호 변경"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"GPU 오버드로 디버깅"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW 오버레이 사용 안함"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"화면 합성 목적으로 항상 GPU 사용"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL 추적 사용 설정"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"모바일 네트워크에서 백그라운드 데이터를 사용하지 않도록 설정합니다. 가능한 경우 모바일이 아닌 네트워크가 사용됩니다."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"이 앱에 대해 백그라운드 데이터를 제한하려면 먼저 모바일 데이터 제한을 설정하세요."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"백그라운드 데이터 사용 제한"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"모바일 네트워크만 사용할 수 있는 경우 백그라운드 데이터에 의존하는 앱이 중단될 수 있습니다."\n\n"앱 설정에서 데이터 사용을 더 적절하게 관리할 수 있는 컨트롤을 찾아볼 수 있습니다."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"모바일 네트워크만 사용할 수 있는 경우 백그라운드 데이터에 의존하는 앱이 중단될 수 있습니다.\n\n앱 설정에서 데이터 사용을 더 적절하게 관리할 수 있는 컨트롤을 찾아볼 수 있습니다."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"백그라운드 데이터는 모바일 데이터 한도를 설정한 경우에만 제한할 수 있습니다."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"데이터 자동 동기화를 사용하시겠습니까?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"웹에서 변경한 계정 정보는 모두 태블릿에 자동으로 복사됩니다."\n\n"또한 일부 계정은 태블릿의 변경사항을 웹에 자동으로 복사할 수 있습니다. Google 계정은 이러한 자동 동기화를 지원합니다."\n\n"각 계정에서 동기화하려는 정보의 종류를 선택하려면 \'설정 &gt; 계정\'으로 이동하세요."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"웹에서 변경한 계정 정보는 모두 휴대전화에 자동으로 복사됩니다."\n\n"또한 일부 계정은 휴대전화의 변경사항을 웹에 자동으로 복사할 수 있습니다. Google 계정은 이러한 자동 동기화를 지원합니다."\n\n"각 계정에서 동기화하려는 정보의 종류를 선택하려면 \'설정 &gt; 계정\'으로 이동하세요."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"웹에서 변경한 계정 정보는 모두 태블릿에 자동으로 복사됩니다.\n\n또한 일부 계정은 태블릿의 변경사항을 웹에 자동으로 복사할 수 있습니다. Google 계정은 이러한 자동 동기화를 지원합니다.\n\n각 계정에서 동기화하려는 정보의 종류를 선택하려면 \'설정 &gt; 계정\'으로 이동하세요."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"웹에서 변경한 계정 정보는 모두 휴대전화에 자동으로 복사됩니다.\n\n또한 일부 계정은 휴대전화의 변경사항을 웹에 자동으로 복사할 수 있습니다. Google 계정은 이러한 자동 동기화를 지원합니다.\n\n각 계정에서 동기화하려는 정보의 종류를 선택하려면 \'설정 &gt; 계정\'으로 이동하세요."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"데이터 자동 동기화를 사용 중지하시겠습니까?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"이 경우 데이터와 배터리 사용량이 절약되지만, 최근 정보를 수집하려면 각 계정을 직접 동기화해야 합니다. 또한 업데이트가 발생해도 알림을 받지 못합니다."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"사용 주기 재설정"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"데이터 사용 경고 설정"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"데이터 사용 한도 설정"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"데이터 사용 제한 중"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"지정된 한도에 도달하면 모바일 데이터 연결 사용이 중지됩니다."\n\n"태블릿을 기준으로 데이터 사용량이 측정되며 이동통신사에서는 사용량을 다르게 계산할 수 있으므로 한도를 최대한 낮춰 사용하세요."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"지정된 한도에 도달하면 모바일 데이터 연결 사용이 중지됩니다."\n\n"휴대전화를 기준으로 데이터 사용량이 측정되며 이동통신사에서는 사용량을 다르게 계산할 수 있으므로 한도를 최대한 낮춰 사용하세요."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"지정된 한도에 도달하면 모바일 데이터 연결 사용이 중지됩니다.\n\n태블릿을 기준으로 데이터 사용량이 측정되며 이동통신사에서는 사용량을 다르게 계산할 수 있으므로 한도를 최대한 낮춰 사용하세요."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"지정된 한도에 도달하면 모바일 데이터 연결 사용이 중지됩니다.\n\n휴대전화를 기준으로 데이터 사용량이 측정되며 이동통신사에서는 사용량을 다르게 계산할 수 있으므로 한도를 최대한 낮춰 사용하세요."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"백그라운드 데이터 사용을 제한하시겠습니까?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"백그라운드 모바일 데이터를 제한하는 경우 Wi-Fi 네트워크에 연결되지 않으면 일부 앱 및 서비스가 작동하지 않습니다."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"백그라운드 모바일 데이터를 제한하는 경우 Wi-Fi 네트워크에 연결되지 않으면 일부 앱 및 서비스가 작동하지 않습니다."\n\n"이 설정은 태블릿의 모든 사용자에게 영향을 줍니다."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"백그라운드 모바일 데이터를 제한하는 경우 Wi-Fi 네트워크에 연결되지 않으면 일부 앱 및 서비스가 작동하지 않습니다."\n\n"이 설정은 휴대전화의 모든 사용자에게 영향을 줍니다."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"백그라운드 모바일 데이터를 제한하는 경우 Wi-Fi 네트워크에 연결되지 않으면 일부 앱 및 서비스가 작동하지 않습니다.\n\n이 설정은 태블릿의 모든 사용자에게 영향을 줍니다."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"백그라운드 모바일 데이터를 제한하는 경우 Wi-Fi 네트워크에 연결되지 않으면 일부 앱 및 서비스가 작동하지 않습니다.\n\n이 설정은 휴대전화의 모든 사용자에게 영향을 줍니다."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"경고"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"한도"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"삭제된 앱"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"사용자"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"제한된 프로필"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"새 사용자 추가"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"새로운 사용자를 추가로 만들어서 이 기기를 공유할 수 있습니다. 각 사용자는 별도의 공간을 갖게 되며 내 앱, 배경화면 등을 맞춤설정할 수 있습니다. 사용자는 또한 모두에게 영향을 주는 Wi-Fi와 같은 태블릿 설정을 조정할 수 있습니다."\n\n"새로운 사용자를 만든 후에 해당 사용자는 설정 과정을 진행해야 합니다."\n\n"모든 사용자는 다른 사용자들을 대신하여 업데이트된 앱 권한을 승인할 수 있습니다."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"새로운 사용자를 만들면 해당 사용자의 설정 과정을 진행해야 합니다."\n\n"모든 사용자는 다른 사용자들을 대신하여 업데이트된 앱 권한을 승인할 수 있습니다."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"새로운 사용자를 추가로 만들어서 이 기기를 공유할 수 있습니다. 각 사용자는 별도의 공간을 갖게 되며 내 앱, 배경화면 등을 맞춤설정할 수 있습니다. 사용자는 또한 모두에게 영향을 주는 Wi-Fi와 같은 태블릿 설정을 조정할 수 있습니다.\n\n새로운 사용자를 만든 후에 해당 사용자는 설정 과정을 진행해야 합니다.\n\n모든 사용자는 다른 사용자들을 대신하여 업데이트된 앱 권한을 승인할 수 있습니다."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"새로운 사용자를 만들면 해당 사용자의 설정 과정을 진행해야 합니다.\n\n모든 사용자는 다른 사용자들을 대신하여 업데이트된 앱 권한을 승인할 수 있습니다."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"지금 사용자를 설정하시겠습니까?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"사용자가 태블릿을 사용하여 자신의 공간을 설정할 수 있는지 확인하세요."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"지금 프로필을 설정하시겠습니까?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"이 설정은 휴대전화의 모든 사용자에게 영향을 줍니다."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"언어 변경"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"글꼴 크기 변경"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"제한사항"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"제한사항 삭제"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN 변경"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"알림 표시"</string>
     <string name="help_label" msgid="1107174367904110532">"도움말"</string>
     <string name="user_account_title" msgid="1127193807312271167">"콘텐츠용 계정"</string>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 498aa4d9548..288d4e3475b 100755
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -22,4 +22,6 @@
     <dimen name="keyguard_appwidget_picker_margin_left">2dip</dimen>
     <dimen name="keyguard_appwidget_picker_margin_right">2dip</dimen>
     <integer name="keyguard_appwidget_picker_cols">2</integer>
+
+    <dimen name="captioning_preview_height">100dp</dimen>
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 2fde16776fe..9581200d3f9 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Vieta"</item>
     <item msgid="255608127647030286">"Asmeninės"</item>
     <item msgid="4588829735729884491">"Susirašinėjimas žinutėmis"</item>
-    <item msgid="8971765125227378270">"Įrenginys"</item>
+    <item msgid="886742181977884584">"Medija"</item>
+    <item msgid="7924928667052300589">"Įrenginys"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"apytikslė vietovė"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"leisti garso įrašą"</item>
     <item msgid="8374996688066472414">"skaityti iškarpinę"</item>
     <item msgid="3045529469061083747">"keisti iškarpinę"</item>
+    <item msgid="5124443975763747838">"medijos mygtukai"</item>
+    <item msgid="4547883971364273343">"garso sutelktis"</item>
+    <item msgid="2603878814882344450">"pagrindinis garsumas"</item>
+    <item msgid="7136963238377062018">"balso garsumas"</item>
+    <item msgid="4270236897655923007">"skambučio garsumas"</item>
+    <item msgid="6325739889222559394">"medijos garsumas"</item>
+    <item msgid="5762123934816216821">"signalo garsumas"</item>
+    <item msgid="785049718065337473">"pranešimų garsumas"</item>
+    <item msgid="6700305533746877052">"„Bluetooth“ garsumas"</item>
+    <item msgid="2029227495214047094">"neužmigdyti"</item>
+    <item msgid="26109888160231211">"stebėti vietovę"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Vietovė"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Leisti garso įrašą"</item>
     <item msgid="136815868796597058">"Skaityti iškarpinę"</item>
     <item msgid="5238692940326972503">"Keisti iškarpinę"</item>
+    <item msgid="5753789168376302997">"Medijos mygtukai"</item>
+    <item msgid="3265262911688671938">"Garso sutelktis"</item>
+    <item msgid="2098976479485046797">"Pagrindinis garsumas"</item>
+    <item msgid="5660213838861789350">"Balso garsumas"</item>
+    <item msgid="7983336752371254444">"Skambučio garsumas"</item>
+    <item msgid="7878027809189330917">"Medijos garsumas"</item>
+    <item msgid="7260546305036218513">"Signalo garsumas"</item>
+    <item msgid="9103719301075748925">"Pranešimo garsumas"</item>
+    <item msgid="7025966722295861512">"„Bluetooth“ garsumas"</item>
+    <item msgid="4665183401128289653">"Neužmigdyti"</item>
+    <item msgid="8584357129746649222">"Vietovė"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Trumpas"</item>
     <item msgid="2560532955514699713">"Vidutinis"</item>
     <item msgid="2372711992605524591">"Ilgas"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (derinimas)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Naudoti „Dalvik“"</item>
+    <item msgid="5131846588686178907">"Naudoti ART"</item>
+    <item msgid="4530003713865319928">"Naudoti ART derinimo versiją"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Niekada netikrinti"</item>
     <item msgid="6042769699089883931">"Tikrinti tik DRM turinį"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Ekrane (linijos)"</item>
     <item msgid="120512413928262547">"adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Išjungti"</item>
+    <item msgid="7688197031296835369">"Rodyti perdangos sritis"</item>
+    <item msgid="8332661909019981149">"Rodyti priešingą perdangą"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standartinis apribojimas"</item>
     <item msgid="4071574792028999443">"Nėra fono procesų"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 70ee336fdfa..a3320df2a16 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -275,8 +275,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_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>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Reikalauti skaitinio PIN kodo ar slaptažodžio, norint iššifruoti planšetinį kompiuterį kaskart jį įjungus"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Reikalauti skaitinio PIN kodo ar slaptažodžio, norint iššifruoti telefoną kaskart jį įjungus"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifruotas"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Galite užšifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją ir kitus failus. Užšifravę planšetinį kompiuterį turėsite įvesti skaitinį PIN kodą arba slaptažodį, kad iššifruotumėte jį kiekvieną kartą įjungę. Planšetinio kompiuterio iššifruoti negalite, išskyrus atvejus, kai atkuriate gamyklinius duomenis, ištrindami visus turimus duomenis."\n\n"Šifravimas trunka valandą ar daugiau. Turite pradėti darbą naudodami įkrautą akumuliatorių ir laikyti planšetinį kompiuterį prijungtą prie maitinimo tinklo, kol šifravimas bus baigtas. Pertraukus šifravimo procesą bus prarasti kai kurie arba visi duomenys."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Galite užšifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją ir kitus failus. Užšifravę telefoną turėsite įvesti skaitinį PIN kodą arba slaptažodį, kad iššifruotumėte jį kiekvieną kartą įjungę. Telefono iššifruoti negalite, išskyrus atvejus, atkuriate gamyklinius duomenis, ištrindami visus turimus duomenis."\n\n"Šifravimas trunka valandą ar daugiau. Turite pradėti darbą naudodami įkrautą akumuliatorių ir laikyti telefoną prijungtą prie maitinimo tinklo, kol šifravimas bus baigtas. Pertraukus šifravimo procesą bus prarasti kai kurie arba visi duomenys."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Galite užšifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją ir kitus failus. Užšifravę planšetinį kompiuterį turėsite įvesti skaitinį PIN kodą arba slaptažodį, kad iššifruotumėte jį kiekvieną kartą įjungę. Planšetinio kompiuterio iššifruoti negalite, išskyrus atvejus, kai atkuriate gamyklinius duomenis, ištrindami visus turimus duomenis.\n\nŠifravimas trunka valandą ar daugiau. Turite pradėti darbą naudodami įkrautą akumuliatorių ir laikyti planšetinį kompiuterį prijungtą prie maitinimo tinklo, kol šifravimas bus baigtas. Pertraukus šifravimo procesą bus prarasti kai kurie arba visi duomenys."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Galite užšifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją ir kitus failus. Užšifravę telefoną turėsite įvesti skaitinį PIN kodą arba slaptažodį, kad iššifruotumėte jį kiekvieną kartą įjungę. Telefono iššifruoti negalite, išskyrus atvejus, atkuriate gamyklinius duomenis, ištrindami visus turimus duomenis.\n\nŠifravimas trunka valandą ar daugiau. Turite pradėti darbą naudodami įkrautą akumuliatorių ir laikyti telefoną prijungtą prie maitinimo tinklo, kol šifravimas bus baigtas. Pertraukus šifravimo procesą bus prarasti kai kurie arba visi duomenys."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifruoti planšetinį kompiuterį"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifruoti telefoną"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Įkraukite akumuliatorių ir bandykite dar kartą."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Bandyti dar kartą po <xliff:g id="DELAY">^1</xliff:g> sek."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Įveskite slaptažodį"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifruotė nepavyko"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifravimas buvo pertrauktas ir negali būti užbaigtas. Todėl duomenys planšetiniame kompiuteryje nebepasiekiami. "\n\n" Jei norite vėl naudoti planšetinį kompiuterį, turite iš naujo nustatyti gamyklinius nustatymus. Kai iš naujo nustatę nustatysite planšetinį kompiuterį, galėsite atkurti visus duomenis, kurių atsarginės kopijos buvo sukurtos „Google“ paskyroje."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifravimas buvo pertrauktas ir negali būti užbaigtas. Todėl duomenys telefone nebepasiekiami. "\n\n"Jei norite vėl naudoti telefoną, turite iš naujo nustatyti gamyklinius nustatymus. Kai iš naujo nustatę nustatysite telefoną, galėsite atkurti visus duomenis, kurių atsarginės kopijos buvo sukurtos „Google“ paskyroje."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifravimas buvo pertrauktas ir negali būti užbaigtas. Todėl duomenys planšetiniame kompiuteryje nebepasiekiami. \n\n Jei norite vėl naudoti planšetinį kompiuterį, turite iš naujo nustatyti gamyklinius nustatymus. Kai iš naujo nustatę nustatysite planšetinį kompiuterį, galėsite atkurti visus duomenis, kurių atsarginės kopijos buvo sukurtos „Google“ paskyroje."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifravimas buvo pertrauktas ir negali būti užbaigtas. Todėl duomenys telefone nebepasiekiami. \n\nJei norite vėl naudoti telefoną, turite iš naujo nustatyti gamyklinius nustatymus. Kai iš naujo nustatę nustatysite telefoną, galėsite atkurti visus duomenis, kurių atsarginės kopijos buvo sukurtos „Google“ paskyroje."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Perjungti įvesties metodą"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pasir. ekrano užrak."</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pasirinkti atsarginį užrakinimą"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Jungiama"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Prijungta"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Pasiekiama"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Naudojama"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Pateikties nustatymai"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Atsijungti?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Tai nutrauks ryšį su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Išjungta"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Negalima, nes išjungtas ALR"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Kai ši funkcija įjungta, galite programos turinį perduoti į kitą ALR palaikantį įrenginį laikydami du įrenginius šalia. Pavyzdžiui, galite perduoti Naršyklės puslapius, „YouTube“ vaizdo įrašus, žmonių kontaktus ir daugiau."\n\n"Tiesiog sudėkite du įrenginius vieną šalia kito (suglaudę galinėmis dalimis) ir palieskite ekraną. Programa nustato, kas bus perduodama."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Kai ši funkcija įjungta, galite programos turinį perduoti į kitą ALR palaikantį įrenginį laikydami du įrenginius šalia. Pavyzdžiui, galite perduoti Naršyklės puslapius, „YouTube“ vaizdo įrašus, žmonių kontaktus ir daugiau.\n\nTiesiog sudėkite du įrenginius vieną šalia kito (suglaudę galinėmis dalimis) ir palieskite ekraną. Programa nustato, kas bus perduodama."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Tinklo paslaugos aptikimas"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Leisti kitų įrenginių programoms aptikti šio įrenginio programas"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -541,7 +542,7 @@
     <string name="wifi_settings_category" msgid="8719175790520448014">"„Wi-Fi“ nustatymai"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Nustatyti ir valdyti bevielius prieigos taškus"</string>
-    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Pasirinkti „Wi-Fi“"</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Rinktis „Wi-Fi“"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"„Wi-Fi“ įjungiama…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"„Wi-Fi“ išjungiama…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Klaida"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Saugoma „<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>“"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", saugoma „<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>“"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nėra"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Siekiant tiksliau nustatyti vietą ir dėl kitų priežasčių, „<xliff:g id="APP_NAME">%1$s</xliff:g>“ prašo leidimo nuskaityti tinklus, net kai „Wi-Fi“ yra išjungtas."\n\n"Ar norite suteikti leidimą nuskaityti visoms to prašančioms programoms?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Siekiant tiksliau nustatyti vietą ir dėl kitų priežasčių, „<xliff:g id="APP_NAME">%1$s</xliff:g>“ prašo leidimo nuskaityti tinklus, net kai „Wi-Fi“ yra išjungtas.\n\nAr norite suteikti leidimą nuskaityti visoms to prašančioms programoms?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Leisti"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Atmesti"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Prijungti"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"ĮSPĖJIMAS: gali būti taikomi papildomi operatoriaus duomenų mokesčiai.\n\nNustatant planšetinį kompiuterį gali reikėti daug naudoti tinklą."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ĮSPĖJIMAS: gali būti taikomi papildomi operatoriaus duomenų mokesčiai.\n\nNustatant telefoną gali reikėti daug naudoti tinklą."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ĮSPĖJIMAS: planšetinis kompiuteris galės patvirtinti, kad naudojama naujausia programinė įranga, tik kai bus pasiekiamas interneto ryšys."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ĮSPĖJIMAS: telefonas galės patvirtinti, kad naudojama naujausia programinė įranga, tik kai bus pasiekiamas interneto ryšys."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Planšetiniam kompiuteriui nepavyko prisijungti prie šio „Wi-Fi“ tinklo."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM kortelės PIN kodas"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Netinkamas PIN kodas"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN kodai neatitinka"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Nepavyksta pakeisti PIN kodo."\n"Tikriausiai netinkamas PIN kodas."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Nepavyksta pakeisti PIN kodo.\nTikriausiai netinkamas PIN kodas."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM kortelės PIN kodas sėkmingai pakeistas"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Neįmanoma pakeisti SIM kortelės užrakto būsenos."\n"Tikriausiai netinkamas PIN kodas."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Neįmanoma pakeisti SIM kortelės užrakto būsenos.\nTikriausiai netinkamas PIN kodas."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Gerai"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Atšaukti"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Planšetinio kompiuterio būsena"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Gamyklos duomenų nustatymas iš naujo"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Ištrinami visi planšetinio kompiuterio duomenys"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Ištrina visus telefono duomenis"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Taip bus ištrinti visi duomenys iš planšetinio kompiuterio "<b>"vidinės atminties"</b>", įskaitant:"\n\n<li>"„Google“ paskyrą"</li>\n<li>"Sistemos ir programų duomenis bei nustatymus"</li>\n<li>"Atsisiųstas programas"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Taip bus ištrinti visi duomenys iš telefono "<b>"vidinės atminties"</b>", įskaitant:"\n\n<li>"„Google“ paskyrą"</li>\n<li>"Sistemos ir programų duomenis bei nustatymus"</li>\n<li>"Atsisiųstas programas"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Šiuo metu esate prisijungę prie šių paskyrų:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Taip bus ištrinti visi duomenys iš planšetinio kompiuterio "<b>"vidinės atminties"</b>", įskaitant:\n\n"<li>"„Google“ paskyrą"</li>\n<li>"Sistemos ir programų duomenis bei nustatymus"</li>\n<li>"Atsisiųstas programas"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Taip bus ištrinti visi duomenys iš telefono "<b>"vidinės atminties"</b>", įskaitant:\n\n"<li>"„Google“ paskyrą"</li>\n<li>"Sistemos ir programų duomenis bei nustatymus"</li>\n<li>"Atsisiųstas programas"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Šiuo metu esate prisijungę prie šių paskyrų:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzika"</li>\n<li>"Nuotraukos"</li>\n<li>"Kiti naudotojo duomenys"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Norint išvalyti muzikos failus, paveikslėlius bei kitus naudotojo duomenis, reikia ištrinti "<b>"USB atmintį"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Norint išvalyti muzikos failus, paveikslėlius ir kitus naudotojo duomenis, reikia ištrinti "<b>"SD kortelę"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Rodyti padėtus procesus"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Iš naujo nustat. nuostat."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Iš naujo nust. nuostat.?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Bus iš naujo nustatytos visos toliau nurodytų elementų nuostatos:"\n\n" "<li>"Neleidžiamos programos"</li>\n" "<li>"Neleidžiami programų pranešimai"</li>\n" "<li>"Numatytosios veiksmų programos"</li>\n" "<li>"Programų fono duomenų apribojimai"</li>\n\n" Nebus prarasti jokie programų duomenys."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Bus iš naujo nustatytos visos toliau nurodytų elementų nuostatos:\n\n "<li>"Neleidžiamos programos"</li>\n" "<li>"Neleidžiami programų pranešimai"</li>\n" "<li>"Numatytosios veiksmų programos"</li>\n" "<li>"Programų fono duomenų apribojimai"</li>\n\n" Nebus prarasti jokie programų duomenys."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Iš naujo nustat. program."</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Valdyti vietą"</string>
     <string name="filter" msgid="2018011724373033887">"Filtruoti"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Kad perj., pasp. vald. ir tarpo kl."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Numatytasis"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Klaviatūros išdėstymai"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Naudotojo žodynas"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Asmeninis žodynas"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Asmeniniai žodynai"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Asmeninis žodynas"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Pridėti"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Pridėti prie žodyno"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Įtraukti parinktį į įjungimo meniu, kad būtų galima pranešti apie triktį"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Veikti"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Kraunant ekranas niekada neveiks miego režimu"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Įgalinti „Bluetooth“ HCI šnipinėjimo žurnalą"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Užfiksuoti visus faile esančius „Bluetooth“ HCI paketus"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Pasirinkti vykdymo laiką"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Pasirinkti vykdymo laiką"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Įkelti iš naujo, kad vykdymo laikas būtų pakeistas iš <xliff:g id="OLD">%1$s</xliff:g> į <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Leisti imituoti vietas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Leisti imituoti vietas"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Leisti USB perkrovimą?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Apsaugoti USB atmintį"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Programos turi prašyti leidimo skaityti USB atmintį"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Apsaugoti USB atmintį?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Jei USB atmintis yra apsaugota, programos turi prašyti leidimo skaityti išorinėje atmintinėje esančius duomenis."\n\n"Kai kurios programos gali neveikti, kol jų neatnaujins kūrėjai."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Jei USB atmintis yra apsaugota, programos turi prašyti leidimo skaityti išorinėje atmintinėje esančius duomenis.\n\nKai kurios programos gali neveikti, kol jų neatnaujins kūrėjai."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Apsaugoti SD kortelę"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Programos turi prašyti leidimo skaityti SD kortelę"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Apsaugoti SD kortelę?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Jei SD kortelė yra apsaugota, programos turi prašyti leidimo skaityti išorinėje atmintinėje esančius duomenis."\n\n"Kai kurios programos gali neveikti, kol jų neatnaujins kūrėjai."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Jei SD kortelė yra apsaugota, programos turi prašyti leidimo skaityti išorinėje atmintinėje esančius duomenis.\n\nKai kurios programos gali neveikti, kol jų neatnaujins kūrėjai."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Vietinis terminalas"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Įgal. terminalo progr., siūlančią prieigą prie viet. apvalkalo"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Pasirinkti programėlę"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Pasirinkti valdiklį"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Sukurti valdiklį ir leisti prieigą?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Paslaugos"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</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_screen_magnification_summary" msgid="2380627654189671754">"Kai ši funkcija įjungta, galite artinti ir tolinti tris kartus palietę ekraną.\n\nKai priartinate, galite:\n"<ul><li>"Iš lėto apžvelgti: mažiausiai dviem pirštais vilkite ekranu."</li>\n<li>"Koreguoti priartinimo lygį: suimkite mažiausiai dviem pirštais arba išskėskite juos."</li></ul>\n\n"Be to, galite laikinai padidinti tai, kas po pirštu, tris kartus palietę ir laikydami. Esant šiai padidinto vaizdo būsenai galite vilkti pirštu, jei norite naršyti skirtingas ekrano dalis. Pakelkite pirštą, kad grįžtumėte į ankstesnę būseną.\n\nPastaba: palietimo tris kartus, kad būtų padidinta, funkcija veikia visur, išskyrus klaviatūrą ir naršymo juostą."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Spart. pritaikymo neįgal. įjungimas"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Įjungta"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Išjungta"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kai ši funkcija įjungta, galite greitai įgalinti pritaikymo neįgaliesiems funkcijas šiais dviem veiksmais:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Kai ši funkcija įjungta, galite greitai įgalinti pritaikymo neįgaliesiems funkcijas šiais dviem veiksmais:\n\n1 veiksmas: paspauskite ir laikykite paspaudę maitinimo mygtuką, kol išgirsite garsą ar pajusite vibraciją.\n\n2 veiksmas: palieskite ir laikykite palietę dviem pirštais, kol išgirsite patvirtinamąjį garso pranešimą\n\nJei įrenginį naudoja keli naudotojai, užrakinimo ekrane įjungus šią funkciją laikinai bus įgalintas pritaikymas neįgaliesiems, kol įrenginys bus atrakintas."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Didelis tekstas"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ekrano didinimas"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automat. atnaujinti ekrano didinimą"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"„TalkBack“ teikia atsiliepimus žodžiu, kad padėtų akliems ir sutrikusio regėjimo naudotojams. Ar norite nemokamai įdiegti šią funkciją iš „Android“ prekyvietės?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nepateikta jokių aprašų."</string>
     <string name="settings_button" msgid="3006713718908152930">"Nustatymai"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Spausdinimas"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Spausdinimo nustatymai"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Paslaugos"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Naudoti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"„<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>“ galės gauti jūsų spausdinamus dokumentus. Šiuose dokumentuose gali būti delikačių duomenų."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Nėra įdiegta jokių paslaugų"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Nustatymai"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Pridėti spausdintuvų"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Įjungta"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Išjungta"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterija"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Kas naudojo akumuliatorių"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Akum. naudoj. duom. nepasiek."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"„Wi-Fi“ vykdoma"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Planšetinis kompiuteris"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefonas"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Duomenys išsiųsti"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Gauti duomenys"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Mob. tinklo duomenys išsiųsti"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Mobiliojo tinklo duomenys gauti"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"„Wi‑Fi“ tinklo duomenys išsiųsti"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"„Wi‑Fi“ tinklo duomenys gauti"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Garso įrašas"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Vaizdo įrašas"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Laikas, kai buvo įjungta"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Garso aukštis"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Daro poveikį sakomo teksto tonui"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Kalba"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Kalba nepasirinkta"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Nustato konkrečiai kalbai būdingą sakomo teksto balsą"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Klausytis pavyzdžio"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Paleisti trumpą kalbos sintezės demonstraciją"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP nepalaikoma."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Negalite konfigūruoti EAP „Wi-Fi“ ryšio, kai vykdoma sąranka. Po sąrankos tai galėsite padaryti skiltyje „Nustatymai“ &gt; „Belaidis ryšys ir tinklai“."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Prisijungimas gali užtrukti kelias minutes…"</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Palieskite "<b>"Kitas"</b>", kad tęstumėte sąranką."\n\n"Palieskite "<b>"Atgal"</b>", kad prisijungtumėte prie kito „Wi-Fi“ tinklo."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Palieskite "<b>"Kitas"</b>", kad tęstumėte sąranką.\n\nPalieskite "<b>"Atgal"</b>", kad prisijungtumėte prie kito „Wi-Fi“ tinklo."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinchronizavimas įgalintas"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinchronizavimas neleidžiamas"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Sinchronizavimo klaida."</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalendorius"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kontaktai"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Sveiki! Tai – „Google“ sinchronizavimas!"</font>" "\n"Tai yra „Google“ požiūris į duomenų sinchronizavimą, kad būtų galima pasiekti kontaktus, susitikimus ir dar daugiau, nesvarbu, kur būtumėte."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Sveiki! Tai – „Google“ sinchronizavimas!"</font>" \nTai yra „Google“ požiūris į duomenų sinchronizavimą, kad būtų galima pasiekti kontaktus, susitikimus ir dar daugiau, nesvarbu, kur būtumėte."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Programos sinchronizavimo nustatymai"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Duomenys ir sinchronizavimas"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Keisti slaptažodį"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Derinti GPU perdangą"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Neleisti HW perdangų"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Komponuojant ekraną visada naudoti GPU"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Įgalinti „OpenGL“ pėdsak."</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Nel. fon. duom. mob. tinkl. Ne mob. tinkl. bus naud., jei pas."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Kad aprib. šios progr. fon. duom., pirm. nustat. mob. duom. apr."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Apriboti foninius duomenis?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Dėl šios funkcijos, kai pasiekiami tik mobilieji tinklai, gali neveikti programos, kurių veikimas priklauso nuo foninių duomenų."\n\n"Programos nustatymuose galite rasti tinkamesnių duomenų naudojimo valdiklių."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Dėl šios funkcijos, kai pasiekiami tik mobilieji tinklai, gali neveikti programos, kurių veikimas priklauso nuo foninių duomenų.\n\nProgramos nustatymuose galite rasti tinkamesnių duomenų naudojimo valdiklių."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Apriboti foninius duomenis galima tik nustačius mobiliojo ryšio duomenų apribojimą."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Įjungti autom. sinchronizavimą?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Bet kokie paskyrų pakeitimai, kuriuos atliekate žiniatinklyje, bus automatiškai nukopijuoti į planšetinį kompiuterį."\n\n"Iš kai kurių paskyrų į žiniatinklį gali būti automatiškai kopijuojami visi planšetiniame kompiuteryje atlikti pakeitimai. Taip pat daroma ir „Google“ paskyroje."\n\n"Jei norite pasirinkti, kokią kiekvienos paskyros informaciją sinchronizuoti, eikite į „Nustatymai“ &gt; „Paskyros“."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Bet kokie paskyrų pakeitimai, kuriuos atliekate žiniatinklyje, bus automatiškai nukopijuoti į telefoną."\n\n"Iš kai kurių paskyrų į žiniatinklį gali būti automatiškai kopijuojami visi telefone atlikti pakeitimai. Taip pat daroma ir „Google“ paskyroje."\n\n"Jei norite pasirinkti, kokią kiekvienos paskyros informaciją sinchronizuoti, eikite į „Nustatymai“ &gt; „Paskyros“."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Bet kokie paskyrų pakeitimai, kuriuos atliekate žiniatinklyje, bus automatiškai nukopijuoti į planšetinį kompiuterį.\n\nIš kai kurių paskyrų į žiniatinklį gali būti automatiškai kopijuojami visi planšetiniame kompiuteryje atlikti pakeitimai. Taip pat daroma ir „Google“ paskyroje.\n\nJei norite pasirinkti, kokią kiekvienos paskyros informaciją sinchronizuoti, eikite į „Nustatymai“ &gt; „Paskyros“."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Bet kokie paskyrų pakeitimai, kuriuos atliekate žiniatinklyje, bus automatiškai nukopijuoti į telefoną.\n\nIš kai kurių paskyrų į žiniatinklį gali būti automatiškai kopijuojami visi telefone atlikti pakeitimai. Taip pat daroma ir „Google“ paskyroje.\n\nJei norite pasirinkti, kokią kiekvienos paskyros informaciją sinchronizuoti, eikite į „Nustatymai“ &gt; „Paskyros“."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Išjungti autom. sinchronizavimą?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Tai atlikus bus saikingai naudojami duomenys ir akumuliatoriaus energija, tačiau, jei norėsite surinkti naujausią informaciją, turėsite sinchronizuoti kiekvieną paskyrą rankiniu būdu. Be to, negausite pranešimų, kai atsiras naujinių."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Naudojimo ciklo nustatymo iš naujo data"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Nustatyti duomenų naudojimo įspėjimą"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Nustatyti duomenų naudojimo apribojimą"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Duomenų naudojimo ribojimas"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobiliųjų duomenų ryšys bus neleidžiamas, kai bus pasiektas nurodytas apribojimas."\n\n"Kadangi sunaudoti duomenys skaičiuojami planšetiniu kompiuteriu, o operatorius gali apskaičiuoti kitaip, apsvarstykite galimybę naudoti mažesnį apribojimą."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobiliųjų duomenų ryšys bus neleidžiamas, kai bus pasiektas nurodytas apribojimas."\n\n"Kadangi sunaudoti duomenys skaičiuojami telefonu, o operatorius gali apskaičiuoti kitaip, apsvarstykite galimybę naudoti mažesnį apribojimą."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobiliųjų duomenų ryšys bus neleidžiamas, kai bus pasiektas nurodytas apribojimas.\n\nKadangi sunaudoti duomenys skaičiuojami planšetiniu kompiuteriu, o operatorius gali apskaičiuoti kitaip, apsvarstykite galimybę naudoti mažesnį apribojimą."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobiliųjų duomenų ryšys bus neleidžiamas, kai bus pasiektas nurodytas apribojimas.\n\nKadangi sunaudoti duomenys skaičiuojami telefonu, o operatorius gali apskaičiuoti kitaip, apsvarstykite galimybę naudoti mažesnį apribojimą."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Apriboti foninius duomenis?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Jei apribosite mobiliojo ryšio fono duomenis, kai kurios programos ir paslaugos neveiks, nebent prisijungsite prie „Wi-Fi“ tinklo."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Jei apribosite mobiliojo ryšio fono duomenis, kai kurios programos ir paslaugos neveiks, nebent prisijungsite prie „Wi-Fi“ tinklo."\n\n"Šis nustatymas taikomas visiems šio planšetinio kompiuterio naudotojams."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Jei apribosite mobiliojo ryšio fono duomenis, kai kurios programos ir paslaugos neveiks, nebent prisijungsite prie „Wi-Fi“ tinklo."\n\n"Šis nustatymas taikomas visiems šio telefono naudotojams."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Jei apribosite mobiliojo ryšio fono duomenis, kai kurios programos ir paslaugos neveiks, nebent prisijungsite prie „Wi-Fi“ tinklo.\n\nŠis nustatymas taikomas visiems šio planšetinio kompiuterio naudotojams."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Jei apribosite mobiliojo ryšio fono duomenis, kai kurios programos ir paslaugos neveiks, nebent prisijungsite prie „Wi-Fi“ tinklo.\n\nŠis nustatymas taikomas visiems šio telefono naudotojams."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"įspėjimas"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"apribojimas"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Pašalintos programos"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Naudotojas"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ribotas profilis"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Pridėti naują naudotoją"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Galite bendrinti šį įrenginį su kitais žmonėmis sukurdami papildomų naudotojų. Kiekvienam naudotojui suteikiama atskira vieta, kurią jie gali tinkinti savo programomis, ekrano fonu ir pan. Be to, naudotojai gali koreguoti planšetinio kompiuterio nustatymus, pvz., „Wi-Fi“, kurie turi įtakos visiems."\n\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_add_user_message_long" msgid="3086244205384741788">"Galite bendrinti šį įrenginį su kitais žmonėmis sukurdami papildomų naudotojų. Kiekvienam naudotojui suteikiama atskira vieta, kurią jie gali tinkinti savo programomis, ekrano fonu ir pan. Be to, naudotojai gali koreguoti planšetinio kompiuterio nustatymus, pvz., „Wi-Fi“, kurie turi įtakos visiems.\n\nSukūrus naują naudotoją, tas asmuo turi įvykdyti sąrankos procesą.\n\nBet kuris naudotojas gali priimti atnaujintų programų leidimus visų kitų naudotojų vardu."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Sukūrus naują naudotoją, tas asmuo turi įvykdyti sąrankos procesą.\n\nBet kuris naudotojas gali priimti atnaujintų programų leidimus visų kitų naudotojų vardu."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Nustatyti naudotoją dabar?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Įsitikinkite, kad asmuo gali naudoti planšetinį kompiuterį ir nustatyti savo vietą"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Nustatyti profilį dabar?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Šis nustatymas turi įtakos visiems šio telefono naudotojams."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Keisti kalbą"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Keisti šrifto dydį"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Apribojimai"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Pašalinti apribojimus"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Keisti PIN kodą"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Rodyti pranešimus"</string>
     <string name="help_label" msgid="1107174367904110532">"Pagalba"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Turiniui skirta paskyra"</string>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 444871eff50..97bf2b8cbed 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Atrašanās vieta"</item>
     <item msgid="255608127647030286">"Privāti"</item>
     <item msgid="4588829735729884491">"Ziņojumapmaiņa"</item>
-    <item msgid="8971765125227378270">"Ierīce"</item>
+    <item msgid="886742181977884584">"Multivide"</item>
+    <item msgid="7924928667052300589">"Ierīce"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"aptuvena atrašanās vieta"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"atskaņot audio"</item>
     <item msgid="8374996688066472414">"lasīt starpliktuvi"</item>
     <item msgid="3045529469061083747">"modificēt starpliktuvi"</item>
+    <item msgid="5124443975763747838">"multivides pogas"</item>
+    <item msgid="4547883971364273343">"audio uzsvars"</item>
+    <item msgid="2603878814882344450">"galvenais skaļums"</item>
+    <item msgid="7136963238377062018">"balss skaļums"</item>
+    <item msgid="4270236897655923007">"zvana skaļums"</item>
+    <item msgid="6325739889222559394">"multivides skaļums"</item>
+    <item msgid="5762123934816216821">"signāla skaļums"</item>
+    <item msgid="785049718065337473">"paziņojumu skaļums"</item>
+    <item msgid="6700305533746877052">"Bluetooth apjoms"</item>
+    <item msgid="2029227495214047094">"neļaut pāriet miega rež."</item>
+    <item msgid="26109888160231211">"pārraudzīt atrašanās vietu"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Atrašanās vieta"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Atskaņot audio"</item>
     <item msgid="136815868796597058">"Lasīt starpliktuvi"</item>
     <item msgid="5238692940326972503">"Modificēt starpliktuvi"</item>
+    <item msgid="5753789168376302997">"Multivides pogas"</item>
+    <item msgid="3265262911688671938">"Audio uzsvars"</item>
+    <item msgid="2098976479485046797">"Galvenais skaļums"</item>
+    <item msgid="5660213838861789350">"Balss skaļums"</item>
+    <item msgid="7983336752371254444">"Zvana skaļums"</item>
+    <item msgid="7878027809189330917">"Multivides skaļums"</item>
+    <item msgid="7260546305036218513">"Signāla skaļums"</item>
+    <item msgid="9103719301075748925">"Paziņojumu skaļums"</item>
+    <item msgid="7025966722295861512">"Bluetooth apjoms"</item>
+    <item msgid="4665183401128289653">"Neļaut pāriet miega rež."</item>
+    <item msgid="8584357129746649222">"Atrašanās vieta"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Īss"</item>
     <item msgid="2560532955514699713">"Vidējs"</item>
     <item msgid="2372711992605524591">"Ilgs"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (atkļūdošana)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Izmantot Dalvik"</item>
+    <item msgid="5131846588686178907">"Izmantot ART"</item>
+    <item msgid="4530003713865319928">"Izmantot ART atkļūdošanas versiju"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nekad nepārbaudīt"</item>
     <item msgid="6042769699089883931">"Pārbaudīt tikai DRM saturu"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Ekrānā kā līnijas"</item>
     <item msgid="120512413928262547">"Komandā “adb shell dumpsys gfxinfo”"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Izslēgta"</item>
+    <item msgid="7688197031296835369">"Rādīt apgab., kur pārsn. kapacitāte"</item>
+    <item msgid="8332661909019981149">"Rādīt kapac. pārsnieguma skaitītāju"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standarta ierobežojums"</item>
     <item msgid="4071574792028999443">"Nav fona procesu"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 4dc054da64d..600aa4a862d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -275,8 +275,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_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>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Ieslēdzot planšetdatoru, ikreiz tiek pieprasīts skaitlisks PIN kods vai parole šifra noņemšanai."</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Ieslēdzot tālruni, ikreiz tiek pieprasīts skaitlisks PIN kods vai parole šifra noņemšanai."</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrēts"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Varat šifrēt kontus, iestatījumus, lejupielādētās lietotnes un tajās esošos datus, multivides un cita veida failus. Ja šifrēsiet planšetdatoru, ikreiz pēc tā ieslēgšanas būs jāievada ciparu PIN vai parole, lai planšetdatoru atšifrētu. Planšetdatora šifrējumu var noņemt, tikai veicot datu atiestatīšanu uz rūpnīcas iestatījumiem. To darot, tiek dzēsti arī visi dati."\n\n"Šifrēšana ilgst stundu vai ilgāk. Akumulatoram ir jābūt pilnībā uzlādētam un planšetdatoram ir jābūt pievienotam elektrotīklam, līdz šifrēšana tiek pabeigta. Ja šifrēšanas process tiks pārtraukts, tiks zaudēti visi dati vai kāda to daļa."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Varat šifrēt kontus, iestatījumus, lejupielādētās lietotnes un tajās esošos datus, multivides un cita veida failus. Ja šifrēsiet tālruni, ikreiz pēc tā ieslēgšanas būs jāievada ciparu PIN vai parole, lai tālruni atšifrētu. Tālruņa šifrējumu var noņemt, tikai veicot datu atiestatīšanu uz rūpnīcas iestatījumiem. To darot, tiek dzēsti arī visi dati."\n\n"Šifrēšana ilgst stundu vai ilgāk. Akumulatoram ir jābūt pilnībā uzlādētam un tālrunim ir jābūt pievienotam elektrotīklam, līdz šifrēšana tiek pabeigta. Ja šifrēšanas process tiks pārtraukts, tiks zaudēti visi dati vai kāda to daļa."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Varat šifrēt kontus, iestatījumus, lejupielādētās lietotnes un tajās esošos datus, multivides un cita veida failus. Ja šifrēsiet planšetdatoru, ikreiz pēc tā ieslēgšanas būs jāievada ciparu PIN vai parole, lai planšetdatoru atšifrētu. Planšetdatora šifrējumu var noņemt, tikai veicot datu atiestatīšanu uz rūpnīcas iestatījumiem. To darot, tiek dzēsti arī visi dati.\n\nŠifrēšana ilgst stundu vai ilgāk. Akumulatoram ir jābūt pilnībā uzlādētam un planšetdatoram ir jābūt pievienotam elektrotīklam, līdz šifrēšana tiek pabeigta. Ja šifrēšanas process tiks pārtraukts, tiks zaudēti visi dati vai kāda to daļa."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Varat šifrēt kontus, iestatījumus, lejupielādētās lietotnes un tajās esošos datus, multivides un cita veida failus. Ja šifrēsiet tālruni, ikreiz pēc tā ieslēgšanas būs jāievada ciparu PIN vai parole, lai tālruni atšifrētu. Tālruņa šifrējumu var noņemt, tikai veicot datu atiestatīšanu uz rūpnīcas iestatījumiem. To darot, tiek dzēsti arī visi dati.\n\nŠifrēšana ilgst stundu vai ilgāk. Akumulatoram ir jābūt pilnībā uzlādētam un tālrunim ir jābūt pievienotam elektrotīklam, līdz šifrēšana tiek pabeigta. Ja šifrēšanas process tiks pārtraukts, tiks zaudēti visi dati vai kāda to daļa."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifrēt planšetdatoru"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifrēt tālruni"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Uzlādējiet akumulatoru un mēģiniet vēlreiz."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Mēģiniet vēlreiz pēc <xliff:g id="DELAY">^1</xliff:g> sekundēm."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Ierakstiet paroli"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifrēšana neizdevās."</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifrēšana tika pārtraukta, un to nevar pabeigt. Planšetdatora dati vairs nav pieejami."\n\n"Lai atsāktu lietot planšetdatoru, ir jāveic rūpnīcas iestatījumu atiestatīšana. Kad pēc atiestatīšanas esat pabeidzis planšetdatora iestatīšanu, varat atjaunot visus datus, kas tika dublēti jūsu Google kontā."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifrēšana tika pārtraukta, un to nevar pabeigt. Tālruņa dati vairs nav pieejami."\n\n"Lai atsāktu lietot tālruni, ir jāveic rūpnīcas iestatījumu atiestatīšana. Kad pēc atiestatīšanas esat pabeidzis tālruņa iestatīšanu, varat atjaunot visus datus, kas tika dublēti jūsu Google kontā."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifrēšana tika pārtraukta, un to nevar pabeigt. Planšetdatora dati vairs nav pieejami.\n\nLai atsāktu lietot planšetdatoru, ir jāveic rūpnīcas iestatījumu atiestatīšana. Kad pēc atiestatīšanas esat pabeidzis planšetdatora iestatīšanu, varat atjaunot visus datus, kas tika dublēti jūsu Google kontā."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifrēšana tika pārtraukta, un to nevar pabeigt. Tālruņa dati vairs nav pieejami.\n\nLai atsāktu lietot tālruni, ir jāveic rūpnīcas iestatījumu atiestatīšana. Kad pēc atiestatīšanas esat pabeidzis tālruņa iestatīšanu, varat atjaunot visus datus, kas tika dublēti jūsu Google kontā."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Pārslēgt ievades metodi"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekrāna bloķēš. izvēle"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Rezerves bloķ. izvēle"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Notiek savienojuma izveide."</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Pievienotas"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Pieejamas"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Tiek lietota"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Displeja iestatījumi"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Vai pārtraukt savienojumu?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Tiks pārtraukts savienojums ar:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Izslēgta"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nav pieejams, jo NFC ir izslēgti."</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Ja šī funkcija ir ieslēgta, varat pārvietot lietotnes saturu uz citu ierīci, kas atbalsta NFC, novietojot ierīces blakus vienu otrai. Piemēram, varat pārvietot pārlūkprogrammas lapas, YouTube videoklipus, kontaktpersonas lietotnē Personas un citu saturu."\n\n"Vienkārši novietojiet ierīces blakus (parasti saskaroties to aizmugures daļai) un pieskarieties savam ekrānam. Lietotne noteiks pārvietojamo informāciju."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Ja šī funkcija ir ieslēgta, varat pārvietot lietotnes saturu uz citu ierīci, kas atbalsta NFC, novietojot ierīces blakus vienu otrai. Piemēram, varat pārvietot pārlūkprogrammas lapas, YouTube videoklipus, kontaktpersonas lietotnē Personas un citu saturu.\n\nVienkārši novietojiet ierīces blakus (parasti saskaroties to aizmugures daļai) un pieskarieties savam ekrānam. Lietotne noteiks pārvietojamo informāciju."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Tīkla pakalpojuma atrašana"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Atļaut citās ierīcēs esošām lietotnēm atrast šajā ierīcē esošās lietotnes"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Nodrošināts ar <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", nodrošināts ar <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nav"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Lai uzlabotu atrašanās vietu noteikšanas precizitāti, kā arī citas funkcijas, lietotnē <xliff:g id="APP_NAME">%1$s</xliff:g> tiek pieprasīts ieslēgt tīkla skenēšanu, pat ja Wi-Fi savienojums ir izslēgts."\n\n"Vai atļaut šo darbību visām lietotnēm, kurās tiek pieprasīta skenēšana?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Lai uzlabotu atrašanās vietu noteikšanas precizitāti, kā arī citas funkcijas, lietotnē <xliff:g id="APP_NAME">%1$s</xliff:g> tiek pieprasīts ieslēgt tīkla skenēšanu, pat ja Wi-Fi savienojums ir izslēgts.\n\nVai atļaut šo darbību visām lietotnēm, kurās tiek pieprasīta skenēšana?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Atļaut"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Noraidīt"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Izveidot savienojumu"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"BRĪDINĀJUMS! Mobilo sakaru operators var piemērot papildu maksu par datu pārraidi.\n\nIestatot planšetdatoru, var ievērojami palielināties tīkla darbības apjoms."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"BRĪDINĀJUMS! Mobilo sakaru operators var piemērot papildu maksu par datu pārraidi.\n\nIestatot tālruni, var ievērojami palielināties tīkla darbības apjoms."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"BRĪDINĀJUMS!Kamēr nebūs izveidots savienojums ar internetu, planšetdators nevarēs apstiprināt, ka jūsu programmatūra ir atjaunināta."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"BRĪDINĀJUMS! Kamēr nebūs izveidots savienojums ar internetu, tālrunis nevarēs apstiprināt, ka jūsu programmatūra ir atjaunināta."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Planšetdatorā nevarēja izveidot savienojumu ar Wi-Fi tīklu."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN kods"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Nepareizs PIN kods"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN kodi ir atšķirīgi"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Nevar mainīt PIN kodu."\n"Iespējams, ka PIN kods nav pareizs."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Nevar mainīt PIN kodu.\nIespējams, ka PIN kods nav pareizs."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN ir veiksmīgi nomainīts"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Nevar mainīt SIM kartes bloķēšanas stāvokli."\n"Iespējams, ka ievadījāt nepareizu PIN kodu."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Nevar mainīt SIM kartes bloķēšanas stāvokli.\nIespējams, ka ievadījāt nepareizu PIN kodu."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Labi"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Atcelt"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Planšetdatora statuss"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Rūpnīcas datu atiestatīšana"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Dzēš visus datus planšetdatorā"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Dzēst visus tālrunī saglabātos datus"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tādējādi tiks izdzēsti visi planšetdatora "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:"\n\n<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tiks dzēsti visi tālruņa "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:"\n\n<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Pašlaik esat pierakstījies šādos kontos:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tādējādi tiks izdzēsti visi planšetdatora "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:\n\n"<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tiks dzēsti visi tālruņa "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:\n\n"<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Pašlaik esat pierakstījies šādos kontos:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Mūzika"</li>\n<li>"Fotoattēli"</li>\n<li>"Citi lietotāja dati"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Lai dzēstu mūziku, attēlus un citus lietotāja datus, ir jāizdzēš "<b>"USB atmiņas"</b>" saturs."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Lai dzēstu mūziku, attēlus un citus lietotāja datus, ir jādzēš "<b>"SD kartes"</b>" saturs."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Rādīt kešatmiņā iev. pr."</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Atiest. lietotnes prefer."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vai atiest. liet. pref.?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Tādējādi tiks atiestatītas visas preferences saistībā ar:"\n\n<li>"atspējotajām lietotnēm;"</li>\n<li>"atspējoto lietotņu paziņojumiem;"</li>\n<li>"noklusējuma lietojumprogrammām attiecībā uz darbību veikšanu;"</li>\n<li>"fona datu ierobežojumiem attiecībā uz lietotnēm."</li>\n\n"Jūs nezaudēsiet lietotņu datus."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Tādējādi tiks atiestatītas visas preferences saistībā ar:\n\n"<li>"atspējotajām lietotnēm;"</li>\n<li>"atspējoto lietotņu paziņojumiem;"</li>\n<li>"noklusējuma lietojumprogrammām attiecībā uz darbību veikšanu;"</li>\n<li>"fona datu ierobežojumiem attiecībā uz lietotnēm."</li>\n\n"Jūs nezaudēsiet lietotņu datus."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Atiestatīt lietotnes"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Vietas pārvaldība"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrs"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Lai pārsl., nosp. Ctrl + atst. t."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Noklusējums"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tastatūras izkārtojumi"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Lietotāja vārdnīca"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Personiskā vārdnīca"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Personiskās vārdnīcas"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Personiskā vārdnīca"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Pievienot"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Pievienot vārdnīcai"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Iekļaut barošanas izvēlnē kļūdu ziņojuma sagatavošanas opciju"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Atstāt nomodā"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Uzlādes laikā ekrāns nekad nepārslēgsies miega režīmā"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Iespējot Bluetooth HCI analizētāja žurnālu"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tvert visas Bluetooth HCI paketes failā"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Izpildlaika atlase"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Izpildlaika atlase"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Vai atsāknēt, lai mainītu izpildlaiku no <xliff:g id="OLD">%1$s</xliff:g> uz <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Atļaut neīstas vietas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Atļaut neīstas vietas"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Vai atļaut USB atkļūdošanu?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Aizsargāt USB atmiņu"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Lietotnēm ir jāpieprasa atļauja lasīt USB atmiņu."</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Vai aizsargāt USB atmiņu?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Ja USB atmiņa ir aizsargāta, lietotnēm ir jāpieprasa atļauja lasīt datus no ārējas atmiņas."\n\n"Dažas lietotnes, iespējams, nedarbosies, kamēr tās neatjauninās izstrādātāji."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Ja USB atmiņa ir aizsargāta, lietotnēm ir jāpieprasa atļauja lasīt datus no ārējas atmiņas.\n\nDažas lietotnes, iespējams, nedarbosies, kamēr tās neatjauninās izstrādātāji."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Aizsargāt SD karti"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Lietotnēm ir jāpieprasa atļauja lasīt SD karti."</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vai aizsargāt SD karti?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Ja SD karte ir aizsargāta, lietotnēm ir jāpieprasa atļauja lasīt datus no ārējas atmiņas."\n\n"Dažas lietotnes, iespējams, nedarbosies, kamēr tās neatjauninās izstrādātāji."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Ja SD karte ir aizsargāta, lietotnēm ir jāpieprasa atļauja lasīt datus no ārējas atmiņas.\n\nDažas lietotnes, iespējams, nedarbosies, kamēr tās neatjauninās izstrādātāji."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Vietējā beigu lietotne"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Iespējot beigu lietotni, kurā piedāvāta vietējā čaulas piekļuve"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Izvēlēties sīkrīku"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Izvēlēties logrīku"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vai izveidot logrīku un atļaut piekļuvi?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Pakalpojumi"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistēma"</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_screen_magnification_summary" msgid="2380627654189671754">"Ja šī funkcija ir ieslēgta, varat tuvināt un tālināt, trīs reizes pieskaroties ekrānam.\n\nJa veicāt tuvināšanu, varat veikt arī tālāk norādītās darbības.\n"<ul><li>"Panoramēt — velciet divus pirkstus vai vairāk pāri ekrānam."</li>\n<li>"Pielāgot tālummaiņas līmeni — savelciet kopā divus pirkstus vai vairāk vai izpletiet tos."</li></ul>\n\n"Varat arī uz brīdi palielināt zem pirksta redzamo vienumu, trīs reizes pieskaroties ekrānam un turot. Šādā palielinājumā varat pārvilkt pirkstu, lai izvērstu citas ekrāna daļas. Paceliet pirkstu, lai atgrieztu iepriekšējo ekrāna stāvokli.\n\nPiezīme. Palielināšana, trīs reizes pieskaroties ekrānam, darbojas visos ekrānos, izņemot tastatūru un navigācijas joslu."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Pieejamības saīsne"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Ieslēgts"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Izslēgta"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Ja šī funkcija ir ieslēgta, varat ātri iespējot pieejamības funkcijas, veicot divas darbības."\n\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_global_gesture_preference_description" msgid="750438015254396963">"Ja šī funkcija ir ieslēgta, varat ātri iespējot pieejamības funkcijas, veicot divas darbības.\n\n1. darbība: nospiediet barošanas pogu un turiet to, līdz izdzirdat kādu skaņu vai sajūtat vibrāciju.\n\n2. darbība: pieskarieties ar diviem pirkstiem un uzgaidiet, līdz izdzirdat audio apstiprinājumu.\n\nJa ierīcei ir vairāki lietotāji, izmantojot šo saīsni bloķēšanas ekrānā, varat uz laiku iespējot pieejamību līdz ierīces atbloķēšanai."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Liels teksts"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ekrāna palielinājums"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekrāna palielinājuma autom. atjaun."</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Lietotne TalkBack par ekrānā notiekošo informē balss komentāru veidā, lai palīdzētu neredzīgiem un vājredzīgiem lietotājiem. Vai vēlaties to instalēt bez maksas no vietnes Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Apraksts nav sniegts."</string>
     <string name="settings_button" msgid="3006713718908152930">"Iestatījumi"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Drukāšana"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Drukāšanas iestatījumi"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Pakalpojumi"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vai izmantot pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> var saņemt jūsu drukātos dokumentus. Šajos dokumentos var būt ietverti sensitīvi dati."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Nav instalēts neviens pakalpojums"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Iestatījumi"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Pievienot printerus"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Ieslēgta"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Izslēgta"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Akumulators"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Kas patērējis akumulatoru"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Akumul. liet. dati nav pieej."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi darbojas"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Planšetdators"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Tālrunis"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Dati nosūtīti"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Dati ir saņemti"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Nosūtīto mobilo datu apjoms"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Saņemto mobilo datu apjoms"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Nosūtīto Wi‑Fi datu apjoms"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Saņemto Wi‑Fi datu apjoms"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Videoklips"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Laiks ieslēgtā stāvoklī"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonis"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Ietekmē ierunātā teksta toni"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Valoda"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nav atlasīta valoda."</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Runātajam tekstam iestata valodai raksturīgu balsi"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Noklausīties piemēru"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Atskaņot īsu runas sintēzes demonstrāciju"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP netiek atbalstīts."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Iestatīšanas laikā nevar konfigurēt EAP Wi-Fi savienojumu. To var izdarīt pēc iestatīšanas šeit: Iestatījumi &gt; Bezvadu savienojumi un tīkli."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Savienojuma izveide var ilgt dažas minūtes..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Lai turpinātu iestatīšanu, pieskarieties "<b>"Tālāk"</b>"."\n\n"Lai izveidotu savienojumu ar citu Wi-Fi tīklu, pieskarieties "<b>"Atpakaļ"</b>"."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Lai turpinātu iestatīšanu, pieskarieties "<b>"Tālāk"</b>".\n\nLai izveidotu savienojumu ar citu Wi-Fi tīklu, pieskarieties "<b>"Atpakaļ"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinhronizācija iespējota"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinhronizācija atspējota"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Sinhronizācijas kļūda"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Atkļūdot graf. proc. kapac. pārsn."</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Atspējot HW pārklājumus"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Vienmēr izmantot GPU atveidi ekrāna salikšanai"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Iespējot OpenGL trases"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Atsp. fona datus mob. tīklos. Tiks izm. citi tīkli, ja pieejami."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Lai ierob. fona d. šai liet., vispirms jāiest. mob. d. ierobež."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Vai ierobežot fona datus?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ja būs pieejami tikai mobilie tīkli, šī funkcija var pārtraukt tādas lietotnes darbību, kurā tiek izmantoti fona dati."\n\n"Lietotnē pieejamajos iestatījumos varat skatīt citas piemērotas datu lietojuma vadīklas."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ja būs pieejami tikai mobilie tīkli, šī funkcija var pārtraukt tādas lietotnes darbību, kurā tiek izmantoti fona dati.\n\nLietotnē pieejamajos iestatījumos varat skatīt citas piemērotas datu lietojuma vadīklas."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Fona datu ierobežošana ir iespējama tikai tad, ja ir iestatīts mobilo datu ierobežojums."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Vai ieslēgt datu automātisko sinhronizāciju?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Visas tīmekļa kontā veiktās izmaiņas tiks automātiski kopētas uz jūsu planšetdatoru."\n\n"Daži konti var arī automātiski kopēt visas planšetdatorā veiktās izmaiņas uz tīmekļa kontu. Google konts darbojas šādā veidā."\n\n"Lai izvēlētos sinhronizējamās informācijas veidu katrā kontā, skatiet: Iestatījumi &gt; Konti."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Visas jūsu tīmekļa kontos veiktās izmaiņas tiks automātiski kopētas uz jūsu tālruni."\n\n"Daži konti var arī automātiski kopēt visas tālrunī veiktās izmaiņas uz tīmekļa kontu. Google konts darbojas šādā veidā."\n\n"Lai izvēlētos sinhronizējamās informācijas veidu katrā kontā, skatiet: Iestatījumi &gt; Konti."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Visas tīmekļa kontā veiktās izmaiņas tiks automātiski kopētas uz jūsu planšetdatoru.\n\nDaži konti var arī automātiski kopēt visas planšetdatorā veiktās izmaiņas uz tīmekļa kontu. Google konts darbojas šādā veidā.\n\nLai izvēlētos sinhronizējamās informācijas veidu katrā kontā, skatiet: Iestatījumi &gt; Konti."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Visas jūsu tīmekļa kontos veiktās izmaiņas tiks automātiski kopētas uz jūsu tālruni.\n\nDaži konti var arī automātiski kopēt visas tālrunī veiktās izmaiņas uz tīmekļa kontu. Google konts darbojas šādā veidā.\n\nLai izvēlētos sinhronizējamās informācijas veidu katrā kontā, skatiet: Iestatījumi &gt; Konti."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Vai izslēgt datu automātisko sinhronizāciju?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Tiks saglabāti dati un akumulatora lietojums, bet jums vajadzēs manuāli sinhronizēt katru kontu, lai apkopotu jaunāko informāciju. Un jūs nesaņemsiet paziņojumus par atjauninājumiem."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Izmantošanas cikla atiestatīšanas datums"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Datu lietošanas brīdinājuma iestatīšana"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Datu lietošanas ierobežojuma iestatīšana"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Datu izmantošanas ierobežošana"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobilais datu savienojums tiks atspējots, tiklīdz būs sasniegts noteiktais ierobežojums."\n\n"Tā kā datu lietojuma apjoms tiek aprēķināts planšetdatorā un mobilo sakaru operatoru aprēķini par datu lietojumu var atšķirties, ierobežojumu izvēlieties apdomīgi."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobilais datu savienojums tiks atspējots, tiklīdz būs sasniegts noteiktais ierobežojums."\n\n"Tā kā datu lietojuma apjoms tiek aprēķināts tālrunī un mobilo sakaru operatoru aprēķini par datu lietojumu var atšķirties, ierobežojumu izvēlieties apdomīgi."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobilais datu savienojums tiks atspējots, tiklīdz būs sasniegts noteiktais ierobežojums.\n\nTā kā datu lietojuma apjoms tiek aprēķināts planšetdatorā un mobilo sakaru operatoru aprēķini par datu lietojumu var atšķirties, ierobežojumu izvēlieties apdomīgi."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobilais datu savienojums tiks atspējots, tiklīdz būs sasniegts noteiktais ierobežojums.\n\nTā kā datu lietojuma apjoms tiek aprēķināts tālrunī un mobilo sakaru operatoru aprēķini par datu lietojumu var atšķirties, ierobežojumu izvēlieties apdomīgi."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vai ierobežot fona datus?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Ierobežojot fona mobilos datus, dažas lietotnes un pakalpojumi nedarbosies, ja vien netiks izveidots savienojums ar Wi-Fi tīklu."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ierobežojot fona mobilos datus, dažas lietotnes un pakalpojumi nedarbosies, ja vien netiks izveidots savienojums ar Wi-Fi tīklu."\n\n"Šis iestatījums ietekmē visus šī planšetdatora lietotājus."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ierobežojot fona mobilos datus, dažas lietotnes un pakalpojumi nedarbosies, ja vien netiks izveidots savienojums ar Wi-Fi tīklu."\n\n"Šis iestatījums ietekmē visus šī tālruņa lietotājus."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ierobežojot fona mobilos datus, dažas lietotnes un pakalpojumi nedarbosies, ja vien netiks izveidots savienojums ar Wi-Fi tīklu.\n\nŠis iestatījums ietekmē visus šī planšetdatora lietotājus."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ierobežojot fona mobilos datus, dažas lietotnes un pakalpojumi nedarbosies, ja vien netiks izveidots savienojums ar Wi-Fi tīklu.\n\nŠis iestatījums ietekmē visus šī tālruņa lietotājus."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"brīdinājums"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ierobežojums"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Noņemtās lietotnes"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Lietotājs"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ierobežots profils"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Lietotāja pievienošana"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Varat koplietot šo ierīci ar citām personām, pievienojot papildu lietotājus. Katram lietotājam ir sava vide, ko var pielāgot, izmantojot lietotnes, fona tapetes u.c. Lietotāji var arī pielāgot tādus planšetdatora iestatījumus, kuri attiecas uz visiem lietotājiem, piemēram, Wi-Fi."\n\n"Kad tiek pievienots jauns lietotājs, viņam ir jāveic iestatīšanas process."\n\n"Ikviens lietotājs var atļaut lietotņu atjaunināšanu citu lietotāju vietā."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"Kad ir pievienots jauns lietotājs, viņam ir jāveic iestatīšanas process."\n\n"Ikviens lietotājs var atļaut lietotņu atjaunināšanu citu lietotāju vietā."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Varat koplietot šo ierīci ar citām personām, pievienojot papildu lietotājus. Katram lietotājam ir sava vide, ko var pielāgot, izmantojot lietotnes, fona tapetes u.c. Lietotāji var arī pielāgot tādus planšetdatora iestatījumus, kuri attiecas uz visiem lietotājiem, piemēram, Wi-Fi.\n\nKad tiek pievienots jauns lietotājs, viņam ir jāveic iestatīšanas process.\n\nIkviens lietotājs var atļaut lietotņu atjaunināšanu citu lietotāju vietā."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Kad ir pievienots jauns lietotājs, viņam ir jāveic iestatīšanas process.\n\nIkviens lietotājs var atļaut lietotņu atjaunināšanu citu lietotāju vietā."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Iestatīt kontu tūlīt?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Lietotājam ir jābūt iespējai iestatīt savu telpu, izmantojot planšetdatoru"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Vai iestatīt profilu tūlīt?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Šis iestatījums ietekmē visus šī tālruņa lietotājus."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Valodas maiņa"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Fonta lieluma maiņa"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Ierobežojumi"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Ierobežojumu atcelšana"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Mainīt PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Rādīt paziņojumus"</string>
     <string name="help_label" msgid="1107174367904110532">"Palīdzība"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Konts saturam"</string>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 82d48370868..fd349bc2c0f 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Lokasi"</item>
     <item msgid="255608127647030286">"Peribadi"</item>
     <item msgid="4588829735729884491">"Pemesejan"</item>
-    <item msgid="8971765125227378270">"Peranti"</item>
+    <item msgid="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Peranti"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"lokasi kasar"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"mainkan audio"</item>
     <item msgid="8374996688066472414">"baca papan keratan"</item>
     <item msgid="3045529469061083747">"ubah suai papan keratan"</item>
+    <item msgid="5124443975763747838">"butang media"</item>
+    <item msgid="4547883971364273343">"tumpuan audio"</item>
+    <item msgid="2603878814882344450">"kelantangan induk"</item>
+    <item msgid="7136963238377062018">"kelantangan suara"</item>
+    <item msgid="4270236897655923007">"kelantangan deringan"</item>
+    <item msgid="6325739889222559394">"kelantangan media"</item>
+    <item msgid="5762123934816216821">"kelantangan penggera"</item>
+    <item msgid="785049718065337473">"kelantangan pemberitahuan"</item>
+    <item msgid="6700305533746877052">"kelantangan bluetooth"</item>
+    <item msgid="2029227495214047094">"kekal berjaga"</item>
+    <item msgid="26109888160231211">"pantau lokasi"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokasi"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Mainkan audio"</item>
     <item msgid="136815868796597058">"Baca papan keratan"</item>
     <item msgid="5238692940326972503">"Ubah suai papan keratan"</item>
+    <item msgid="5753789168376302997">"Butang media"</item>
+    <item msgid="3265262911688671938">"Tumpuan audio"</item>
+    <item msgid="2098976479485046797">"Kelantangan utama"</item>
+    <item msgid="5660213838861789350">"Kelantangan suara"</item>
+    <item msgid="7983336752371254444">"Kelantangan deringan"</item>
+    <item msgid="7878027809189330917">"Kelantangan media"</item>
+    <item msgid="7260546305036218513">"Kelantangan penggera"</item>
+    <item msgid="9103719301075748925">"Kelantangan pemberitahuan"</item>
+    <item msgid="7025966722295861512">"Kelantangan Bluetooth"</item>
+    <item msgid="4665183401128289653">"Kekal berjaga"</item>
+    <item msgid="8584357129746649222">"Lokasi"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Pendek"</item>
     <item msgid="2560532955514699713">"Sederhana"</item>
     <item msgid="2372711992605524591">"Panjang"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (nyahpepijat)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Gunakan Dalvik"</item>
+    <item msgid="5131846588686178907">"Gunakan ART"</item>
+    <item msgid="4530003713865319928">"Gunakan binaan nyahpepijat ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Jangan sekali-kali semak"</item>
     <item msgid="6042769699089883931">"Semak kandungan DRM sahaja"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Pada skrin sebagai garis"</item>
     <item msgid="120512413928262547">"Dalam adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Mati"</item>
+    <item msgid="7688197031296835369">"Tunjukkan kawasan lebih lukis"</item>
+    <item msgid="8332661909019981149">"Tunjukkan kaunter lebih lukis"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Had standard"</item>
     <item msgid="4071574792028999443">"Tiada proses latar belakang"</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 7ae90d4c558..adbfc584e66 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Apabila anda membenarkan perayauan data, anda mungkin dikenakan caj perayauan yang tinggi!\n\nTetapan ini melibatkan semua pengguna pada tablet ini."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Apabila anda membenarkan perayauan data, anda mungkin dikenakan caj perayauan yang tinggi!\n\nTetapan ini melibatkan semua pengguna pada telefon ini."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Benarkan perayauan data?"</string>
     <string name="networks" msgid="6333316876545927039">"Pilihan pengendali"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Pilih pengendali rangkaian"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Memerlukan PIN atau kata laluan angka untuk menyahsulit tablet anda setiap kali anda menghidupkannya"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Memerlukan PIN atau kata laluan angka untuk menyahsulit telefon anda setiap kali dan menghidupkannya"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Disulitkan"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Anda boleh menyulitkan akaun anda, tetapan, apl yang dimuat turun dan datanya, media, dan fail-fail lain. Sebaik sahaja anda menyulitkan tablet anda, anda perlu menaip PIN nombor atau kata laluan untuk menyahsulit setiap kali anda menghidupkannya. Anda tidak boleh menyahsulit tablet anda kecuali dengan melakukan penetapan semula data kilang, yang memadamkan semua data anda."\n\n"Penyulitan mengambil masa satu jam atau lebih. Anda mesti bermula dengan bateri yang telah dicas dan memastikan tablet anda dipasang pada palam sehingga penyulitan selesai. Jika anda mengganggu proses penyulitan, anda akan kehilangan sebahagian atau semua data anda."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Anda boleh menyulitkan akaun anda, tetapan, apl yang dimuat turun dan datanya, media, dan fail-fail lain. Sebaik sahaja anda menyulitkan telefon anda, anda perlu menaip PIN nombor atau kata laluan untuk menyahsulit setiap kali anda menghidupkannya. Anda tidak boleh menyahsulit telefon anda kecuali dengan melakukan tetapan semula data kilang, yang memadamkan semua data anda."\n\n"Penyulitan mengambil satu jam atau lebih. Anda mesti bermula dengan bateri yang telah dicas dan memastikan fon anda dipasang pada palam sehingga penyulitan selesai. Jika anda mengganggu proses penyulitan, anda akan kehilangan sebahagian atau semua data anda."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Anda boleh menyulitkan akaun anda, tetapan, apl yang dimuat turun dan datanya, media, dan fail-fail lain. Sebaik sahaja anda menyulitkan tablet anda, anda perlu menaip PIN nombor atau kata laluan untuk menyahsulit setiap kali anda menghidupkannya. Anda tidak boleh menyahsulit tablet anda kecuali dengan melakukan penetapan semula data kilang, yang memadamkan semua data anda.\n\nPenyulitan mengambil masa satu jam atau lebih. Anda mesti bermula dengan bateri yang telah dicas dan memastikan tablet anda dipasang pada palam sehingga penyulitan selesai. Jika anda mengganggu proses penyulitan, anda akan kehilangan sebahagian atau semua data anda."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Anda boleh menyulitkan akaun anda, tetapan, apl yang dimuat turun dan datanya, media, dan fail-fail lain. Sebaik sahaja anda menyulitkan telefon anda, anda perlu menaip PIN nombor atau kata laluan untuk menyahsulit setiap kali anda menghidupkannya. Anda tidak boleh menyahsulit telefon anda kecuali dengan melakukan tetapan semula data kilang, yang memadamkan semua data anda.\n\nPenyulitan mengambil satu jam atau lebih. Anda mesti bermula dengan bateri yang telah dicas dan memastikan fon anda dipasang pada palam sehingga penyulitan selesai. Jika anda mengganggu proses penyulitan, anda akan kehilangan sebahagian atau semua data anda."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Sulitkan tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Sulitkan telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Cas bateri anda dan cuba lagi."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Cuba lagi dalam <xliff:g id="DELAY">^1</xliff:g> saat."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Taipkan kata laluan anda"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Penyulitan tidak berjaya"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Penyulitan telah diganggu dan tidak dapat dilengkapkan. Akibatnya, data pada tablet anda tidak lagi boleh diakses. "\n\n" Untuk menyambung semula menggunakan tablet anda, anda perlu melakukan tetapan semula kilang. Apabila anda menyediakan tablet anda selepas menetap semula, anda akan berpeluang untuk memulihkan apa-apa data yang dibuat sandaran ke Akaun Google anda."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Penyulitan telah diganggu dan tidak dapat dilengkapkan. Akibatnya, data pada telefon anda tidak lagi boleh diakses. "\n\n"Untuk menyambung semula menggunakan telefon anda, anda perlu melakukan tetapan semula kilang. Apabila anda menetapkan telefon anda selepas menetap semula, anda akan mempunyai peluang untuk memulihkan apa-apa data yang dibuat sandaran ke Akaun Google anda."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Penyulitan telah diganggu dan tidak dapat dilengkapkan. Akibatnya, data pada tablet anda tidak lagi boleh diakses. \n\n Untuk menyambung semula menggunakan tablet anda, anda perlu melakukan tetapan semula kilang. Apabila anda menyediakan tablet anda selepas menetap semula, anda akan berpeluang untuk memulihkan apa-apa data yang dibuat sandaran ke Akaun Google anda."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Penyulitan telah diganggu dan tidak dapat dilengkapkan. Akibatnya, data pada telefon anda tidak lagi boleh diakses. \n\nUntuk menyambung semula menggunakan telefon anda, anda perlu melakukan tetapan semula kilang. Apabila anda menetapkan telefon anda selepas menetap semula, anda akan mempunyai peluang untuk memulihkan apa-apa data yang dibuat sandaran ke Akaun Google anda."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Tukar kaedah input"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pilih kunci skrin"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pilih kunci sandaran"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Menyambung"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Bersambung"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Tersedia"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Sedang digunakan"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Tetapan paparan"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Putuskan sambungan WiFi?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Ini akan menamatkan sambungan anda dengan:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Mati"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Tidak tersedia kerana NFC dimatikan"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Apabila ciri ini dihidupkan, anda boleh memancarkan kandungan aplikasi ke peranti mampu NFC yang lain dengan merapatkan kedua-dua peranti itu. Sebagai contoh, anda boleh memancarkan halaman Penyemak Imbas, video YouTube, maklumat Hubungan orang dan banyak lagi."\n\n"Hanya rapatkan kedua-dua peranti (biasanya bersentuhan belakang dengan belakang) dan kemudian sentuh skrin anda. Aplikasi menentukan apa yang akan dipancarkan."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Apabila ciri ini dihidupkan, anda boleh memancarkan kandungan aplikasi ke peranti mampu NFC yang lain dengan merapatkan kedua-dua peranti itu. Sebagai contoh, anda boleh memancarkan halaman Penyemak Imbas, video YouTube, maklumat Hubungan orang dan banyak lagi.\n\nHanya rapatkan kedua-dua peranti (biasanya bersentuhan belakang dengan belakang) dan kemudian sentuh skrin anda. Aplikasi menentukan apa yang akan dipancarkan."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Penemuan perkhidmatan rangkaian"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Benarkan apl pada peranti lain untuk menemui apl pada peranti ini"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Dijamin dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", dijamin dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Tiada"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Untuk memperbaik ketepatan lokasi dan untuk tujuan lain, <xliff:g id="APP_NAME">%1$s</xliff:g> ingin menghidupkan imbasan rangkaian, walaupun semasa Wi-Fi dimatikan."\n\n"Benarkan fungsi ini untuk semua apl yang ingin mengimbas?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Untuk memperbaik ketepatan lokasi dan untuk tujuan lain, <xliff:g id="APP_NAME">%1$s</xliff:g> ingin menghidupkan imbasan rangkaian, walaupun semasa Wi-Fi dimatikan.\n\nBenarkan fungsi ini untuk semua apl yang ingin mengimbas?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Benarkan"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Tolak"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Sambung"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"AMARAN: Anda mungkin dikenakan caj data pembawa tambahan.\n\nPersediaan tablet berpotensi menggunakan aktiviti rangkaian yang besar."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AMARAN: Anda mungkin dikenakan caj data pembawa tambahan.\n\nPersediaan telefon berpotensi menggunakan aktiviti rangkaian yang banyak."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"AMARAN: Tablet tidak dapat mengesahkan bahawa perisian anda terkini sehingga anda mempunyai sambungan internet."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"AMARAN: Telefon tidak dapat mengesahkan bahawa perisian anda terkini sehingga anda mempunyai sambungan internet."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet tidak dapat menyambung ke rangkaian Wi-Fi ini."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN salah"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN tidak sepadan"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Tidak boleh menukar PIN."\n"Berkemungkinan PIN salah."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Tidak boleh menukar PIN.\nBerkemungkinan PIN salah."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN SIM berjaya ditukar"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Tidak boleh menukar keadaan kunci kad SIM."\n"Mungkin PIN salah."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Tidak boleh menukar keadaan kunci kad SIM.\nMungkin PIN salah."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Batal"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status tablet"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Tetapan semula data kilang"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Memadamkan semua data pada tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Memadamkan semua data pada telefon"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ini akan memadamkan semua data dari "<b>"storan dalaman"</b>" tablet anda, termasuk:"\n\n<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Ini akan memadamkan semua data dari "<b>"storan dalaman"</b>" telefon anda, termasuk:"\n\n<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Anda melog masuk ke dalam akaun berikut buat masa ini:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Ini akan memadamkan semua data dari "<b>"storan dalaman"</b>" tablet anda, termasuk:\n\n"<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Ini akan memadamkan semua data dari "<b>"storan dalaman"</b>" telefon anda, termasuk:\n\n"<li>"Akaun Google anda"</li>\n<li>"Data dan tetapan sistem dan aplikasi"</li>\n<li>"Aplikasi yang dimuat turun"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Anda melog masuk ke dalam akaun berikut buat masa ini:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna yang lain"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Untuk memadam bersih muzik, gambar dan data pengguna lain, "<b>"storan USB"</b>" perlu dipadamkan."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Untuk turut memadam bersih muzik, gambar dan data pengguna lain, "<b>"kad SD"</b>" perlu dipadamkan."</string>
@@ -956,7 +957,7 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Titik panas mudah alih"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Penambatan Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Penambatan"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Liputan t\'batan &amp; m\'alih"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Liputan tambatan &amp; mudah alih"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Penambatan USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB disambungkan, semak untuk menambat"</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Tunjuk proses yg dicache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Tetapkan semula pilihan apl"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Tetapkan semula pilihan app?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ini akan menetapkan semula semua pilihan untuk:"\n\n" "<li>"Apl dilumpuhkan"</li>\n" "<li>"Pemberitahuan apl dilumpuhkan"</li>\n" "<li>"Aplikasi lalai untuk tindakan"</li>\n" "<li>"Sekatan data latar belakang untuk apl"</li>\n\n" Anda tidak akan kehilangan sebarang data apl."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ini akan menetapkan semula semua pilihan untuk:\n\n "<li>"Apl dilumpuhkan"</li>\n" "<li>"Pemberitahuan apl dilumpuhkan"</li>\n" "<li>"Aplikasi lalai untuk tindakan"</li>\n" "<li>"Sekatan data latar belakang untuk apl"</li>\n\n" Anda tidak akan kehilangan sebarang data apl."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Tetapkan semula apl"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Urus ruang"</string>
     <string name="filter" msgid="2018011724373033887">"Tapis"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Untuk bertukar, tekan Control-Spacebar"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Lalai"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Susun atur papan kekunci"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kamus pengguna"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Kamus peribadi"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Kamus peribadi"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Kamus peribadi"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Tambah"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Tambah ke kamus"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Masukkan pilihan dalam menu kuasa untuk mengambil laporan pepijat"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Tetap berjaga"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skrin tidak sekali-kali akan tidur semasa pengecasan"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Dayakan log intip HCI Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tangkap semua paket HCI bluetooth dalam fail"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Pilih waktu jalan"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Pilih waktu jalan"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"But semula untuk menukar waktu jalan daripada <xliff:g id="OLD">%1$s</xliff:g> kepada <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Benarkan lokasi olokan"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Benarkan lokasi olokan"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Benarkan penyahpepijatan USB?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Lindungi storan USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apl mesti meminta kebenaran untuk membaca storan USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Lindungi storan USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Apabila storan USB dilindungi, apl mesti meminta kebenaran untuk membaca data dari storan luaran."\n\n"Sesetengah apl mungkin tidak berfungsi sehingga dikemas kini oleh pemaju apl itu."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Apabila storan USB dilindungi, apl mesti meminta kebenaran untuk membaca data dari storan luaran.\n\nSesetengah apl mungkin tidak berfungsi sehingga dikemas kini oleh pemaju apl itu."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Lindungi kad SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apl mesti meminta kebenaran untuk membaca kad SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Lindungi kad SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Apabila kad SD dilindungi, apl mesti meminta kebenaran untuk membaca data dari storan luaran."\n\n"Sesetengah apl mungkin tidak berfungsi sehingga dikemas kini oleh pemaju apl itu."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Apabila kad SD dilindungi, apl mesti meminta kebenaran untuk membaca data dari storan luaran.\n\nSesetengah apl mungkin tidak berfungsi sehingga dikemas kini oleh pemaju apl itu."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal setempat"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Dayakan apl terminal yang menawarkan akses shell tempatan"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Pilih alat"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Pilih widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Buat widget dan benarkan akses?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Perkhidmatan"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</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_screen_magnification_summary" msgid="2380627654189671754">"Apabila ciri ini dihidupkan, anda boleh mengezum masuk dan keluar dengan mengetik skrin tiga kali.\n\nSemasa dizum masuk, anda boleh:\n"<ul><li>"Menyorot: Seret menggunakan dua atau lebih jari merentasi skrin."</li>\n<li>"Melaraskan tahap zum: Rapatkan atau jarakkan dua atau lebih jari."</li></ul>\n\n"Anda juga boleh membesarkan item di bawah jari anda untuk sementara waktu dengan mengetik tiga kali dan menahannya. Dalam keadaan zum besar ini, anda boleh menyeret jari anda untuk meneroka bahagian-bahagian lain pada skrin. Angkat jari anda untuk kembali kepada keadaan sebelumnya.\n\nNota: Ketik tiga kali untuk pembesaran berfungsi di semua tempat kecuali pada papan kekunci dan bar navigasi."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Pintasan kebolehcapaian"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Hidupkan"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Matikan"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Apabila ciri ini dihidupkan, anda boleh mendayakan ciri kebolehaksesan dengan cepat dalam dua langkah:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Apabila ciri ini dihidupkan, anda boleh mendayakan ciri kebolehaksesan dengan cepat dalam dua langkah:\n\nLangkah 1: Tekan dan tahan butang kuasa sehingga anda mendengar bunyi atau merasai getaran.\n\nLangkah 2: Sentuh terus menggunakan dua jari sehingga anda mendengar pengesahan audio.\n\nJika peranti digunakan oleh beberapa orang pengguna, menggunakan pintasan ini pada skrin kunci akan mendayakan kebolehaksesan untuk sementara waktu sehingga peranti dibuka kuncinya."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Teks besar"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Pembesaran skrin"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto kemas kini pembesaran skrin"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack menyediakan maklum balas bersuara untuk membantu pengguna yang buta dan berpenglihatan kabur. Adakah anda ingin memasangnya secara percuma dari Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Tiada keterangan disediakan."</string>
     <string name="settings_button" msgid="3006713718908152930">"Tetapan"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Pencetakan"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Tetapan pencetakan"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Perkhidmatan"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> boleh menerima dokumen yang anda cetak. Dokumen seperti itu mungkin mengandungi data sensitif."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Tiada perkhidmatan dipasangkan"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Tetapan"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Tambah pencetak"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Hidup"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Mati"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Apa yang telah menggunakan bateri"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Data penggunaan bateri tidak tersedia.."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi berjalan"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Data yang dihantar"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Data yang diterima"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Data mudah alih yang dihantar"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Data mudah alih yang diterima"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Data Wi-Fi yang dihantar"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Data Wi-Fi yang diterima"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Masa hidup"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pic"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Mempengaruhi nada teks pertuturan"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Bahasa"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Bahasa tidak dipilih"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Menetapkan suara khusus bahasa untuk teks pertuturan"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Dengar contoh"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Mainkan tunjuk cara singkat sintesis pertuturan"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP tidak disokong."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Anda tidak boleh mengkonfigurasi sambungan Wi-Fi EAP semasa persediaan. Selepas persediaan, anda boleh berbuat demikian dalam Tetapan &gt;  Wayarles &amp; rangkaian."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Penyambungan boleh mengambil masa beberapa minit..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Sentuh "<b>"Seterusnya"</b>" untuk meneruskan dengan persediaan."\n\n"Sentuh "<b>"Kembali"</b>" untuk menyambung kepada rangkaian Wi-Fi lain."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Sentuh "<b>"Seterusnya"</b>" untuk meneruskan dengan persediaan.\n\nSentuh "<b>"Kembali"</b>" untuk menyambung kepada rangkaian Wi-Fi lain."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Segerak didayakan"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Segerak dilumpuhkan"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Ralat penyegerakan."</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Nyahpepijat lebih lukis GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Lumpuhkan tindihan atas HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Sentiasa gunakan GPU untuk komposit skrin"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Dayakan kesan OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Lumpuhkan data latar belakang pada rangkaian mudah alih. Rangkaian bukan mudah alih akan digunakan jika tersedia."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Untuk menyekat data latar belakang untuk aplikasi ini, mula-mula tetapkan had data mudah alih."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Hadkan data latar belakang?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ciri ini boleh menyebabkan apl yang bergantung kepada data latar belakang berhenti berfungsi apabila hanya rangkaian bermeter yang tersedia."\n\n"Anda boleh menemui lebih banyak kawalan penggunaan data dalam tetapan yang tersedia dalam apl."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ciri ini boleh menyebabkan apl yang bergantung kepada data latar belakang berhenti berfungsi apabila hanya rangkaian bermeter yang tersedia.\n\nAnda boleh menemui lebih banyak kawalan penggunaan data dalam tetapan yang tersedia dalam apl."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Menyekat data latar belakang hanya boleh dilakukan apabila anda telah menetapkan had data mudah alih."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Hidupkan auto-segerak data?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Sebarang perubahan yang anda buat kepada akaun anda di web akan disalin secara automatik ke tablet anda."\n\n"Sesetengah akaun juga boleh secara automatik menyalin sebarang perubahan yang anda buat di tablet ke web. Akaun Google juga berfungsi begini."\n\n"Untuk memilih jenis maklumat yang hendak disegerakkan dalam setiap akaun, pergi ke Tetapan &gt; Akaun."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Sebarang perubahan yang anda buat kepada akaun anda di web akan disalin secara automatik ke telefon anda."\n\n"Sesetengah akaun juga boleh secara automatik menyalin sebarang perubahan yang anda buat di telefon ke web. Akaun Google juga berfungsi begini."\n\n"Untuk memilih maklumat jenis apa untuk disegerakkan dalam setiap akaun, pergi ke Tetapan &gt; Akaun."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Sebarang perubahan yang anda buat kepada akaun anda di web akan disalin secara automatik ke tablet anda.\n\nSesetengah akaun juga boleh secara automatik menyalin sebarang perubahan yang anda buat di tablet ke web. Akaun Google juga berfungsi begini.\n\nUntuk memilih jenis maklumat yang hendak disegerakkan dalam setiap akaun, pergi ke Tetapan &gt; Akaun."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Sebarang perubahan yang anda buat kepada akaun anda di web akan disalin secara automatik ke telefon anda.\n\nSesetengah akaun juga boleh secara automatik menyalin sebarang perubahan yang anda buat di telefon ke web. Akaun Google juga berfungsi begini.\n\nUntuk memilih maklumat jenis apa untuk disegerakkan dalam setiap akaun, pergi ke Tetapan &gt; Akaun."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Matikan auto-segerak data?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Ini akan memelihara data dan penggunaan bateri, tetapi anda perlu menyegerakkan setiap akaun secara manual untuk mengumpul maklumat terkini. Dan anda takkan menerima pemberitahuan apabila kemas kini berlaku."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tarikh tetapan semula kitaran penggunaan"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Tetapkan amaran penggunaan data"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Tetapkan had penggunaan data"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Mengehadkan penggunaan data"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Sambungan data mudah alih anda akan dilumpuhkan apabila mencapai had tertentu."\n\n"Memandangkan tablet anda yang mengukur penggunaan data anda dan pembawa anda mungkin mengira penggunaan secara berbeza, pertimbangkan menggunakan had konservatif."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Sambungan data mudah alih anda akan dilumpuhkan apabila mencapai had tertentu."\n\n"Memandangkan telefon anda yang mengukur penggunaan data anda dan pembawa anda mungkin mengira penggunaan secara berbeza, pertimbangkan menggunakan had konservatif."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Sambungan data mudah alih anda akan dilumpuhkan apabila mencapai had tertentu.\n\nMemandangkan tablet anda yang mengukur penggunaan data anda dan pembawa anda mungkin mengira penggunaan secara berbeza, pertimbangkan menggunakan had konservatif."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Sambungan data mudah alih anda akan dilumpuhkan apabila mencapai had tertentu.\n\nMemandangkan telefon anda yang mengukur penggunaan data anda dan pembawa anda mungkin mengira penggunaan secara berbeza, pertimbangkan menggunakan had konservatif."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Hadkan data latar belakang?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Jika anda menghadkan data mudah alih latar belakang, beberapa apl dan perkhidmatan tidak akan berfungsi melainkan anda bersambung ke rangkaian Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Jika anda mengehadkan data mudah alih latar belakang, sesetengah apl dan perkhidmatan tidak akan berfungsi melainkan anda bersambung ke rangkaian Wi-Fi."\n\n"Tetapan ini melibatkan semua pengguna pada tablet ini."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Jika anda mengehadkan data mudah alih latar belakang, sesetengah apl dan perkhidmatan tidak akan berfungsi melainkan anda bersambung ke rangkaian Wi-Fi."\n\n"Tetapan ini melibatkan semua pengguna pada telefon ini."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Jika anda mengehadkan data mudah alih latar belakang, sesetengah apl dan perkhidmatan tidak akan berfungsi melainkan anda bersambung ke rangkaian Wi-Fi.\n\nTetapan ini melibatkan semua pengguna pada tablet ini."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Jika anda mengehadkan data mudah alih latar belakang, sesetengah apl dan perkhidmatan tidak akan berfungsi melainkan anda bersambung ke rangkaian Wi-Fi.\n\nTetapan ini melibatkan semua pengguna pada telefon ini."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"amaran"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"had"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Apl dialih keluar"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Pengguna"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil terhad"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Tambah pengguna baharu"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Anda boleh berkongsi peranti ini dengan orang lain dengan membuat pengguna tambahan. Setiap pengguna mempunyai ruang mereka sendiri yang boleh diperibadikan dengan apl mereka sendiri, kertas dinding dan sebagainya. Pengguna juga boleh melaraskan tetapan tablet seperti Wi-Fi yang melibatkan semua orang."\n\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_add_user_message_long" msgid="3086244205384741788">"Anda boleh berkongsi peranti ini dengan orang lain dengan membuat pengguna tambahan. Setiap pengguna mempunyai ruang mereka sendiri yang boleh diperibadikan dengan apl mereka sendiri, kertas dinding dan sebagainya. Pengguna juga boleh melaraskan tetapan tablet seperti Wi-Fi yang melibatkan semua orang.\n\nSelepas anda membuat pengguna baharu, orang itu perlu melalui proses persediaan.\n\nMana-mana pengguna boleh meluluskan kebenaran kemas kini apl bagi pihak pengguna lain."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Selepas anda membuat pengguna baharu, orang itu perlu melalui proses persediaan.\n\nMana-mana pengguna boleh meluluskan kebenaran kemas kini apl bagi pihak pengguna lain."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Sediakan pengguna sekarang?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Pastikan orang itu tersedia untuk mengambil tablet dan menyediakan ruangnya"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Sediakan profil sekarang?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Tetapan ini melibatkan semua pengguna pada telefon ini."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Tukar bahasa"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Tukar saiz fon"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Sekatan"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Alih keluar sekatan"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Tukar PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Tunjukkan pemberitahuan"</string>
     <string name="help_label" msgid="1107174367904110532">"Bantuan"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Akaun untuk kandungan"</string>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 0a2c15ede65..3ee445d1908 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Posisjon"</item>
     <item msgid="255608127647030286">"Personal"</item>
     <item msgid="4588829735729884491">"Meldinger"</item>
-    <item msgid="8971765125227378270">"Enhet"</item>
+    <item msgid="886742181977884584">"Medier"</item>
+    <item msgid="7924928667052300589">"Enhet"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"anslått posisjon"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"spill av lyd"</item>
     <item msgid="8374996688066472414">"lesing av utklippstavlen"</item>
     <item msgid="3045529469061083747">"endring av utklippstavlen"</item>
+    <item msgid="5124443975763747838">"medieknapper"</item>
+    <item msgid="4547883971364273343">"audiofokus"</item>
+    <item msgid="2603878814882344450">"hovedvolum"</item>
+    <item msgid="7136963238377062018">"stemmevolum"</item>
+    <item msgid="4270236897655923007">"ringevolum"</item>
+    <item msgid="6325739889222559394">"medievolum"</item>
+    <item msgid="5762123934816216821">"alarmvolum"</item>
+    <item msgid="785049718065337473">"varselvolum"</item>
+    <item msgid="6700305533746877052">"bluetooth-volum"</item>
+    <item msgid="2029227495214047094">"hold aktiv"</item>
+    <item msgid="26109888160231211">"overvåk posisjon"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Sted"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Spill av lyd"</item>
     <item msgid="136815868796597058">"Lesing av utklippstavlen"</item>
     <item msgid="5238692940326972503">"Endring av utklippstavlen"</item>
+    <item msgid="5753789168376302997">"Medieknapper"</item>
+    <item msgid="3265262911688671938">"Audiofokus"</item>
+    <item msgid="2098976479485046797">"Hovedvolum"</item>
+    <item msgid="5660213838861789350">"Stemmevolum"</item>
+    <item msgid="7983336752371254444">"Ringevolum"</item>
+    <item msgid="7878027809189330917">"Medievolum"</item>
+    <item msgid="7260546305036218513">"Alarmvolum"</item>
+    <item msgid="9103719301075748925">"Varselvolum"</item>
+    <item msgid="7025966722295861512">"Bluetooth-volum"</item>
+    <item msgid="4665183401128289653">"Hold aktiv"</item>
+    <item msgid="8584357129746649222">"Posisjon"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Middels"</item>
     <item msgid="2372711992605524591">"Lang"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (feilsøking)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Bruk Dalvik"</item>
+    <item msgid="5131846588686178907">"Bruk ART"</item>
+    <item msgid="4530003713865319928">"Bruk ART-delversjonen for feilsøking"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Kontrollér aldri"</item>
     <item msgid="6042769699089883931">"Se kun etter DRM-innhold"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"På skjermen som linjer"</item>
     <item msgid="120512413928262547">"adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Av"</item>
+    <item msgid="7688197031296835369">"Vis overtrekksområder"</item>
+    <item msgid="8332661909019981149">"Vis overtrekksteller"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standard grense"</item>
     <item msgid="4071574792028999443">"Ingen bakgrunnsprosesser"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index cf63a7abf0d..91a4d8a1a16 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -275,8 +275,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">"Å tillate roaming kan medføre høye datakostnader."</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Når du tillater roaming, kan dette føre til høye datakostnader."\n\n"Denne innstillingen påvirker alle brukerne på dette nettbrettet."</string>
-    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Når du tillater roaming, kan dette føre til høye datakostnader."\n\n"Denne innstillingen påvirker alle brukerne på denne telefonen."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Når du tillater roaming, kan dette føre til høye datakostnader.\n\nDenne innstillingen påvirker alle brukerne på dette nettbrettet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Når du tillater roaming, kan dette føre til høye datakostnader.\n\nDenne innstillingen påvirker alle brukerne på denne telefonen."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Vil du tillate roaming?"</string>
     <string name="networks" msgid="6333316876545927039">"Operatør"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Velg en nettverksoperatør"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Krev personlig tallkode eller passord for å dekryptere nettbrettet hver gang du slår det på"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Numerisk personlig kode eller passord kreves for å dekryptere telefonen hver gang du slår den på"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Kryptert"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Du kan kryptere kontoene dine, innstillinger, nedlastede apper og tilhørende data, mediefiler og andre filer. Når du krypterer nettbrettet ditt, må du skrive inn en numerisk PIN-kode eller et passord for å dekryptere nettbrettet hver gang du slår det på. Du kan ikke fjerne krypteringen av nettbrettet uten å gjennomføre en tilbakestilling til fabrikkinnstillingene, noe som fører til at alle dataene blir slettet."\n\n"Det tar minst én time å gjennomføre krypteringen. Du må starte med fulladet batteri og sørge for at nettbrettet er koblet til et strømuttak helt til krypteringen er fullført. Hvis du avbryter krypteringsprosessen, mister du deler av eller alle dataene dine."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Du kan kryptere kontoene dine, innstillinger, nedlastede apper og tilhørende data, mediefiler og andre filer. Når du krypterer telefonen din, må du skrive inn en numerisk PIN-kode eller et passord for å dekryptere telefonen hver gang du slår den på. Du kan ikke fjerne krypteringen av telefonen uten å gjennomføre en tilbakestilling til fabrikkinnstillingene, noe som fører til at alle dataene blir slettet."\n\n"Det tar minst én time å gjennomføre krypteringen. Du må starte med fulladet batteri og sørge for at telefonen er koblet til et strømuttak helt til krypteringen er fullført. Hvis du avbryter krypteringsprosessen, mister du deler av eller alle dataene dine."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Du kan kryptere kontoene dine, innstillinger, nedlastede apper og tilhørende data, mediefiler og andre filer. Når du krypterer nettbrettet ditt, må du skrive inn en numerisk PIN-kode eller et passord for å dekryptere nettbrettet hver gang du slår det på. Du kan ikke fjerne krypteringen av nettbrettet uten å gjennomføre en tilbakestilling til fabrikkinnstillingene, noe som fører til at alle dataene blir slettet.\n\nDet tar minst én time å gjennomføre krypteringen. Du må starte med fulladet batteri og sørge for at nettbrettet er koblet til et strømuttak helt til krypteringen er fullført. Hvis du avbryter krypteringsprosessen, mister du deler av eller alle dataene dine."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Du kan kryptere kontoene dine, innstillinger, nedlastede apper og tilhørende data, mediefiler og andre filer. Når du krypterer telefonen din, må du skrive inn en numerisk PIN-kode eller et passord for å dekryptere telefonen hver gang du slår den på. Du kan ikke fjerne krypteringen av telefonen uten å gjennomføre en tilbakestilling til fabrikkinnstillingene, noe som fører til at alle dataene blir slettet.\n\nDet tar minst én time å gjennomføre krypteringen. Du må starte med fulladet batteri og sørge for at telefonen er koblet til et strømuttak helt til krypteringen er fullført. Hvis du avbryter krypteringsprosessen, mister du deler av eller alle dataene dine."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Krypter nettbrett"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Krypter telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Lad batteriet og prøv på nytt."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Prøv på nytt om <xliff:g id="DELAY">^1</xliff:g> sekunder."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Skriv inn passordet"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Kryptering mislykket"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krypteringen ble avbrutt og kan ikke fullføres. Dette betyr at dataene på nettbrettet ditt ikke lenger er tilgjengelige."\n\n"For å fortsette å bruke nettbrettet, må du gjennomføre en tilbakestilling til fabrikkstandard. Når du konfigurerer nettbrettet etter tilbakestillingen, får du mulighet til å gjenopprette data som ble sikkerhetskopiert til Google-kontoen din."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krypteringen ble avbrutt og kan ikke fullføres. Dette betyr at dataene på telefonen din ikke lenger er tilgjengelige."\n\n"For å fortsette å bruke telefonen, må du gjennomføre en tilbakestilling til fabrikkstandard. Når du konfigurerer telefonen etter tilbakestillingen, får du mulighet til å gjenopprette data som ble sikkerhetskopiert til Google-kontoen din."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Krypteringen ble avbrutt og kan ikke fullføres. Dette betyr at dataene på nettbrettet ditt ikke lenger er tilgjengelige.\n\nFor å fortsette å bruke nettbrettet, må du gjennomføre en tilbakestilling til fabrikkstandard. Når du konfigurerer nettbrettet etter tilbakestillingen, får du mulighet til å gjenopprette data som ble sikkerhetskopiert til Google-kontoen din."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krypteringen ble avbrutt og kan ikke fullføres. Dette betyr at dataene på telefonen din ikke lenger er tilgjengelige.\n\nFor å fortsette å bruke telefonen, må du gjennomføre en tilbakestilling til fabrikkstandard. Når du konfigurerer telefonen etter tilbakestillingen, får du mulighet til å gjenopprette data som ble sikkerhetskopiert til Google-kontoen din."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Bytt inndatametode"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Velg skjermlås"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Velg reservelås"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Kobler til"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Tilkoblet"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Tilgjengelig"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"I bruk"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Skjerminnstillinger"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Vil du koble fra?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Dette avslutter tilkoblingen med:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Av"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Utilgjengelig fordi nærfeltskommunikasjon (NFC) er slått av"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Når denne funksjonen er slått på, kan du overføre appinnhold til en annen enhet som støtter nærfeltskommunikasjon (NFC). Du gjør dette ved å holde enhetene tett sammen. Du kan for eksempel trådløst overføre nettsider, YouTube-videoer, kontakter fra Personer og mye mer."\n\n"Du bare holder enhetene mot hverandre (helst rygg mot rygg), og trykker på skjermen. Appen avgjør hva som blir overført."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Når denne funksjonen er slått på, kan du overføre appinnhold til en annen enhet som støtter nærfeltskommunikasjon (NFC). Du gjør dette ved å holde enhetene tett sammen. Du kan for eksempel trådløst overføre nettsider, YouTube-videoer, kontakter fra Personer og mye mer.\n\nDu bare holder enhetene mot hverandre (helst rygg mot rygg), og trykker på skjermen. Appen avgjør hva som blir overført."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Oppdaging av nettverkstjenester"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Tillat at andre enheter oppdager apper på denne enheten"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker å bruke nettverksskanning, også når Wi-Fi er slått av, for bedre posisjonsnøyaktighet og andre formål. "\n\n"Vil du tillate dette for alle apper som prøver å skanne?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker å bruke nettverksskanning, også når Wi-Fi er slått av, for bedre posisjonsnøyaktighet og andre formål. \n\nVil du tillate dette for alle apper som prøver å skanne?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillat"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Avvis"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Koble til"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"ADVARSEL: Du kan pådra deg ekstra datakostnader fra operatøren.\n\nNettbrettkonfigureringen kan kreve betydelig nettverksaktivitet."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ADVARSEL: Du kan pådra deg ekstra datakostnader fra operatøren.\n\nTelefonkonfigureringen kan kreve betydelig nettverksaktivitet."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ADVARSEL: Nettbrettet kan ikke bekrefte at programvaren din er oppdatert uten Internett-tilkobling."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ADVARSEL: Telefonen kan ikke bekrefte at programvaren din er oppdatert uten Internett-tilkobling."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Nettbrettet kunne ikke koble til Wi-Fi-nettverket."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM-kode for PIN-kort"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Feil personlig kode"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"De personlige kodene samsvarer ikke"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Kan ikke endre personlig kode."\n"Muligens feil kode."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Kan ikke endre personlig kode.\nMuligens feil kode."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN-koden for SIM-kortet ble endret."</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Kan ikke endre SIM-kortlåsens tilstand."\n"Muligens feil personlig kode."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Kan ikke endre SIM-kortlåsens tilstand.\nMuligens feil personlig kode."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Avbryt"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status for nettbrettet"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrikkinnstillinger"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Sletter alle data på nettbrettet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Fjern alle data fra telefonen"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Dette kommer til å slette alle data fra nettbrettets "<b>"interne lagringsplass"</b>", herunder:"\n\n<li>"Google-kontoen din"</li>\n<li>"Data og innstillinger for system og apper"</li>\n<li>"Nedlastede apper"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Dette vil slette alle data fra telefonens "<b>"interne lagringsplass"</b>", herunder:"\n\n<li>"Google-kontoen din"</li>\n<li>"Data og innstillinger for system og apper"</li>\n<li>"Nedlastede apper"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er for øyeblikket pålogget følgende kontoer:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Dette kommer til å slette alle data fra nettbrettets "<b>"interne lagringsplass"</b>", herunder:\n\n"<li>"Google-kontoen din"</li>\n<li>"Data og innstillinger for system og apper"</li>\n<li>"Nedlastede apper"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Dette vil slette alle data fra telefonens "<b>"interne lagringsplass"</b>", herunder:\n\n"<li>"Google-kontoen din"</li>\n<li>"Data og innstillinger for system og apper"</li>\n<li>"Nedlastede apper"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er for øyeblikket pålogget følgende kontoer:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musikk"</li>\n<li>"Bilder"</li>\n<li>"Andre brukerdata"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"For å slette musikk, bilder og andre brukerdata må "<b>"USB-lageret"</b>" tømmes."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"For å slette musikk, bilder og andre brukerdata, må "<b>"SD-kortet"</b>" tømmes."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Vis bufrede prosesser"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Tilbakestill app-innstillingene"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vil du tilbakestille app-innstillingene?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Dette tilbakestiller alle innstillingene for:"\n\n" "<li>"Deaktiverte apper"</li>\n" "<li>"Varsler for deaktiverte apper"</li>\n" "<li>"Standard apper for handlinger"</li>\n" "<li>"Bakgrunnsdatabegrensninger for apper"</li>\n\n" Du mister ingen appdata."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Dette tilbakestiller alle innstillingene for:\n\n "<li>"Deaktiverte apper"</li>\n" "<li>"Varsler for deaktiverte apper"</li>\n" "<li>"Standard apper for handlinger"</li>\n" "<li>"Bakgrunnsdatabegrensninger for apper"</li>\n\n" Du mister ingen appdata."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Tilbakestill apper"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Styr plass"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Bytt ved å trykke på Ctrl+Mellomromstasten"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Standard"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tastaturoppsett"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Ordliste"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Personlig ordbok"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Personlige ordbøker"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Personlig ordliste"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Legg til"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Legg til ordliste"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Inkluder alternativet for å utføre feilrapport i batterimenyen"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Forbli våken"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skjermen blir aldri svart under lading"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktiver Bluetooth HCI snoop-logg"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Samle alle Bluetooth HCI-pakker i en fil"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Velg kjøretid"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Velg kjøretid"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Vil du starte på nytt for å endre kjøretiden fra <xliff:g id="OLD">%1$s</xliff:g> til <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Tillat simulert posisjon"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillat bruk av simulerte GPS-koordinater"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Aktiver USB-debugging?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Beskytt USB-lagring"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apper må be om tillatelse til å lese USB-lagring"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Vil du beskytte USB-lagringen?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Når USB-lagring er beskyttet, må apper be om tillatelse til å lese data fra ekstern lagring."\n\n"Enkelte apper fungerer ikke før utviklerne har oppdatert dem."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Når USB-lagring er beskyttet, må apper be om tillatelse til å lese data fra ekstern lagring.\n\nEnkelte apper fungerer ikke før utviklerne har oppdatert dem."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Beskytt SD-kort"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apper må be om tillatelse til å lese SD-kort"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vil du beskytte SD-kortet?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Når SD-kortet er beskyttet, må apper be om tillatelse til å lese data fra ekstern lagring."\n\n"Enkelte apper fungerer ikke før utviklerne har oppdatert dem."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Når SD-kortet er beskyttet, må apper be om tillatelse til å lese data fra ekstern lagring.\n\nEnkelte apper fungerer ikke før utviklerne har oppdatert dem."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokal terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Aktiver terminalappen som gir lokal kommandolistetilgang"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Velg gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Velg skrivebordselement"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vil du opprette modulen og gi tilgang?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Tjenester"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</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_screen_magnification_summary" msgid="2380627654189671754">"Når denne funksjonen er aktivert, kan du zoome inn og ut ved å trykke tre ganger på skjermen.\n\nNår du har zoomet inn kan du:\n"<ul><li>"Panorere: Dra to eller flere fingre over skjermen."</li>\n<li>"Tilpasse innzoomingen: Knip sammen eller spre fra hverandre to eller flere fingre."</li></ul>\n\n"Du kan også mildertidig forstørre det som er under fingeren din ved å trykke tre ganger og holde fingeren nede. Mens du forstørrer på denne måten kan du dra fingeren rundt for å se på forskjellige deler av skjermen. Løft fingeren din for å gå tilbake til den forrige visningen.\n\nMerk: Å trykke tre ganger for å forstørre fungerer overalt unntatt på tastaturet og navigasjonsraden."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Snarvei for tilgjengelighet"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"På"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Av"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Når denne funksjonen er slått på, kan du raskt aktivere tilgjengelighetsfunksjoner i to trinn:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Når denne funksjonen er slått på, kan du raskt aktivere tilgjengelighetsfunksjoner i to trinn:\n\nTrinn 1: Trykk og hold inne av/på-knappen til du hører en lyd eller føler en vibrasjon.\n\nTrinn 2: Trykk og hold to fingre på skjermen til du hører en bekreftelse.\n\nHvis enheten har flere brukere, får du midlertidig aktivert tilgjengelighet til enheten låses opp."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Stor tekst"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Skjermforstørrelse"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automatisk oppdatering av skjermforstørrelsen"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Talkback gir muntlig tilbakemelding for å hjelpe blinde og svaksynte brukere. Vil du installere denne appen gratis fra Google Play?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Beskrivelse ble ikke oppgitt."</string>
     <string name="settings_button" msgid="3006713718908152930">"Innstillinger"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Skriver ut"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Utskriftsinnstillinger"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Tjenester"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vil du bruke <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> kan motta dokumenter du skriver ut. Disse dokumentene kan inneholde private data."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Ingen tjenester er installert"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Innstillinger"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Legg til skrivere"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"På"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Av"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Hva som har brukt batteri"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Batteribruksdata ikke tilgj."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi kjører"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Nettbrett"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Data sendt"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Data mottatt"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Mobildata sendt"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Mobildata mottatt"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Wi-Fi-data sendt"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Wi-Fi-data mottatt"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Lyd"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tid på"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Stemmeleie"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Endrer tonehøyden teksten sies med"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Språk"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Språk er ikke valgt"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Velger språkspesifikk stemme"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Lytt til et eksempel"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Spill en kort demonstrasjon av talesyntesen"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP støttes ikke."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Du kan ikke konfigurere en EAP Wi-Fi-tilkobling under konfigurasjonen. Etter konfigurasjonen kan dette gjøres i Innstillinger &gt; Trådløst og nettverk."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Tilkoblingen kan ta noen minutter"</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Trykk på "<b>"Neste"</b>" for å fortsette konfigurasjonen."\n\n"Trykk på "<b>"Tilbake"</b>" for å koble til et annet Wi-Fi-nettverk."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Trykk på "<b>"Neste"</b>" for å fortsette konfigurasjonen.\n\nTrykk på "<b>"Tilbake"</b>" for å koble til et annet Wi-Fi-nettverk."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronisering aktivert"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synkronisering deaktivert"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Synkroniseringsfeil."</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Feilsøk GPU-overtrekk"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Deaktiver HW-overlegg"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Bruk alltid GPU for skjermsammensetting"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktiver OpenGL-spor"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Slå av bakgrunnsdata på mobilnettverk. Wi-Fi brukes hvis tilgj."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Hvis du ønsker å begrense bakgrunnsdata for denne appen, må du først angi en grense for bruk av mobildata."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Vil du begrense bruken av bakgrunnsdata?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Denne funksjonen kan gjøre at apper som er avhengig av bakgrunnsdata slutter å fungere når bare  mobilnettverk er tilgjengelige."\n\n"Du finner bedre egnede alternativer for databruk i appens innstillinger."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Denne funksjonen kan gjøre at apper som er avhengig av bakgrunnsdata slutter å fungere når bare  mobilnettverk er tilgjengelige.\n\nDu finner bedre egnede alternativer for databruk i appens innstillinger."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Du kan begrense bakgrunnsdata, men bare hvis du har angitt en grense for bruk av mobildata."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Vil du slå på auto-synkronisering?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Eventuelle endringer du gjør i kontoene dine på nettet kopieres automatisk til nettbrettet."\n\n"For noen kontoer kopieres også alle endringene du gjør på nettbrettet automatisk til nettet. Google-kontoer fungerer på denne måten."\n\n"For å velge hvilke typer informasjon du vil synkronisere innenfor hver konto, går du til Innstillinger &gt; Kontoer."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Eventuelle endringer du gjør i kontoene dine på nettet kopieres automatisk til telefonen din."\n\n"For noen kontoer kopieres også alle endringene du gjør på telefonen automatisk til nettet. Google-kontoer fungerer på denne måten."\n\n"For å velge hvilke typer informasjon du vil synkronisere innenfor hver konto, går du til Innstillinger &gt; Kontoer."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Eventuelle endringer du gjør i kontoene dine på nettet kopieres automatisk til nettbrettet.\n\nFor noen kontoer kopieres også alle endringene du gjør på nettbrettet automatisk til nettet. Google-kontoer fungerer på denne måten.\n\nFor å velge hvilke typer informasjon du vil synkronisere innenfor hver konto, går du til Innstillinger &gt; Kontoer."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Eventuelle endringer du gjør i kontoene dine på nettet kopieres automatisk til telefonen din.\n\nFor noen kontoer kopieres også alle endringene du gjør på telefonen automatisk til nettet. Google-kontoer fungerer på denne måten.\n\nFor å velge hvilke typer informasjon du vil synkronisere innenfor hver konto, går du til Innstillinger &gt; Kontoer."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Vil du slå av auto-synkronisering?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Dette bevarer data- og batteribruk, men du må synkronisere hver konto manuelt for å samle ny informasjon. Du kommer ikke til å motta varsler når det gjøres oppdateringer."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tilbakestillingsdato for brukssyklus"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Angi advarsel for databruk"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Angi grense for databruk"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Begrensning av databruk"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobildatatilkoblingen din blir deaktivert når angitt grense nås."\n\n"Ettersom databruken måles av nettbrettet ditt, som muligens bruker andre metoder for registrering av forbruk enn operatøren din, bør du angi en moderat grense."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobildatatilkoblingen din blir deaktivert når angitt grense nås."\n\n"Ettersom databruken måles av telefonen din, som muligens bruker andre metoder for registrering av forbruk enn operatøren din, bør du angi en moderat grense."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobildatatilkoblingen din blir deaktivert når angitt grense nås.\n\nEttersom databruken måles av nettbrettet ditt, som muligens bruker andre metoder for registrering av forbruk enn operatøren din, bør du angi en moderat grense."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobildatatilkoblingen din blir deaktivert når angitt grense nås.\n\nEttersom databruken måles av telefonen din, som muligens bruker andre metoder for registrering av forbruk enn operatøren din, bør du angi en moderat grense."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vil du begrense bruken av bakgrunnsdata?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Hvis du begrenser bakgrunnsmobildata, kan det hende at enkelte apper og tjenester ikke fungerer med mindre du er koblet til et Wi-Fi-nettverk."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Hvis du begrenser mobildatabruk i bakgrunnen, fungerer ikke enkelte apper og tjenester med mindre du er tilkoblet Wi-Fi-nettverk."\n\n"Denne innstillingen påvirker alle brukerne på dette nettbrettet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Hvis du begrenser mobildatabruk i bakgrunnen, fungerer ikke enkelte apper og tjenester med mindre du er tilkoblet Wi-Fi-nettverk."\n\n"Denne innstillingen påvirker alle brukerne på denne telefonen."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Hvis du begrenser mobildatabruk i bakgrunnen, fungerer ikke enkelte apper og tjenester med mindre du er tilkoblet Wi-Fi-nettverk.\n\nDenne innstillingen påvirker alle brukerne på dette nettbrettet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Hvis du begrenser mobildatabruk i bakgrunnen, fungerer ikke enkelte apper og tjenester med mindre du er tilkoblet Wi-Fi-nettverk.\n\nDenne innstillingen påvirker alle brukerne på denne telefonen."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"advarsel"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"grense"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Fjernede apper"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Bruker"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Begrenset profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Legg til ny bruker"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Du kan dele denne enheten med andre personer ved å opprette flere brukere. Hver bruker får sitt eget område som de kan tilpasse med egne apper, bakgrunner osv. Brukere kan også tilpasse innstillinger på nettbrettet som påvirker alle, for eksempel for Wi-Fi."\n\n"Når du oppretter nye brukere, må de gå gjennom en konfigurasjonsprosess."\n\n"Alle brukere kan godta oppdaterte apptillatelser på vegne av de andre brukerne."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"Når du oppretter nye brukere, må de gå gjennom en konfigureringsprosess."\n\n"Alle brukere kan godta oppdaterte apptillatelser på vegne av de andre brukerne."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Du kan dele denne enheten med andre personer ved å opprette flere brukere. Hver bruker får sitt eget område som de kan tilpasse med egne apper, bakgrunner osv. Brukere kan også tilpasse innstillinger på nettbrettet som påvirker alle, for eksempel for Wi-Fi.\n\nNår du oppretter nye brukere, må de gå gjennom en konfigurasjonsprosess.\n\nAlle brukere kan godta oppdaterte apptillatelser på vegne av de andre brukerne."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Når du oppretter nye brukere, må de gå gjennom en konfigureringsprosess.\n\nAlle brukere kan godta oppdaterte apptillatelser på vegne av de andre brukerne."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Konfigurere brukeren nå?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Sørg for at personen er tilgjengelig for å bruke nettbrettet og konfigurere området sitt"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Vil du konfigurere profilen nå?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Denne innstillingen påvirker alle brukerne på denne telefonen."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Bytt språk"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Endre skriftstørrelse"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Begrensninger"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Fjern begrensningene"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Endre PIN-koden"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Vis varsler"</string>
     <string name="help_label" msgid="1107174367904110532">"Hjelp"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Konto for innhold"</string>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 320a2a17bd7..69abe1ad54f 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Locatie"</item>
     <item msgid="255608127647030286">"Persoonlijk"</item>
     <item msgid="4588829735729884491">"Berichten"</item>
-    <item msgid="8971765125227378270">"Apparaat"</item>
+    <item msgid="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Apparaat"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"geschatte locatie"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"audio afspelen"</item>
     <item msgid="8374996688066472414">"klembord lezen"</item>
     <item msgid="3045529469061083747">"klembord aanpassen"</item>
+    <item msgid="5124443975763747838">"mediaknoppen"</item>
+    <item msgid="4547883971364273343">"audiofocus"</item>
+    <item msgid="2603878814882344450">"hoofdvolume"</item>
+    <item msgid="7136963238377062018">"stemvolume"</item>
+    <item msgid="4270236897655923007">"beltoonvolume"</item>
+    <item msgid="6325739889222559394">"mediavolume"</item>
+    <item msgid="5762123934816216821">"alarmvolume"</item>
+    <item msgid="785049718065337473">"meldingsvolume"</item>
+    <item msgid="6700305533746877052">"bluetooth-volume"</item>
+    <item msgid="2029227495214047094">"ingeschakeld houden"</item>
+    <item msgid="26109888160231211">"monitorlocatie"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Locatie"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Audio afspelen"</item>
     <item msgid="136815868796597058">"Klembord lezen"</item>
     <item msgid="5238692940326972503">"Klembord aanpassen"</item>
+    <item msgid="5753789168376302997">"Mediaknoppen"</item>
+    <item msgid="3265262911688671938">"Audiofocus"</item>
+    <item msgid="2098976479485046797">"Hoofdvolume"</item>
+    <item msgid="5660213838861789350">"Stemvolume"</item>
+    <item msgid="7983336752371254444">"Beltoonvolume"</item>
+    <item msgid="7878027809189330917">"Mediavolume"</item>
+    <item msgid="7260546305036218513">"Alarmvolume"</item>
+    <item msgid="9103719301075748925">"Meldingsvolume"</item>
+    <item msgid="7025966722295861512">"Bluetooth-volume"</item>
+    <item msgid="4665183401128289653">"Ingeschakeld houden"</item>
+    <item msgid="8584357129746649222">"Locatie"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Normaal"</item>
     <item msgid="2372711992605524591">"Lang"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (foutopsporing)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Dalvik gebruiken"</item>
+    <item msgid="5131846588686178907">"ART gebruiken"</item>
+    <item msgid="4530003713865319928">"ART-foutopsporingsbuild gebruiken"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nooit controleren"</item>
     <item msgid="6042769699089883931">"Alleen controleren op DRM-inhoud"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Op het scherm als lijnen"</item>
     <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Uit"</item>
+    <item msgid="7688197031296835369">"Gedeeltes met overbelasting weergeven"</item>
+    <item msgid="8332661909019981149">"Teller voor overbelasting weergeven"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standaardlimiet"</item>
     <item msgid="4071574792028999443">"Geen achtergrondprocessen"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index ef2444570ea..a4a78a8ecc0 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Wanneer u gegevensroaming toestaat, kunnen er hoge roamingkosten in rekening worden gebracht.\n\nDeze instelling is van invloed op alle gebruikers van deze tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Wanneer u gegevensroaming toestaat, kunnen er hoge roamingkosten in rekening worden gebracht.\n\nDeze instelling is van invloed op alle gebruikers van deze telefoon."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Gegevensroaming toestaan?"</string>
     <string name="networks" msgid="6333316876545927039">"Operator selecteren"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Een mobiele provider kiezen"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Een numerieke PIN-code of wachtwoord vereisen om uw tablet te decoderen wanneer u deze inschakelt"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Een numerieke PIN-code of wachtwoord vereisen om uw telefoon te decoderen wanneer u deze inschakelt"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Gecodeerd"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"U kunt uw account, instellingen, gedownloade apps en de bijbehorende gegevens, media en andere bestanden versleutelen. Zodra u uw tablet heeft versleuteld, moet u telkens een pincode of wachtwoord opgeven om de tablet te coderen wanneer u deze opstart. U kunt het versleutelen van uw tablet uitsluitend ongedaan maken door de fabrieksinstellingen te herstellen. Daarbij worden al uw gegevens gewist."\n\n"Het versleutelen kan een uur of langer duren. U moet beginnen met een volledig opgeladen accu en de tablet moet gedurende het versleutelen op de oplader zijn aangesloten. Als u het versleutelen onderbreekt, kunt u sommige of al uw gegevens kwijtraken."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"U kunt uw account, instellingen, gedownloade apps en de bijbehorende gegevens, media en andere bestanden versleutelen. Zodra u uw telefoon heeft versleuteld, moet u telkens een pincode of wachtwoord opgeven om de telefoon te coderen wanneer u deze opstart. U kunt het versleutelen van uw telefoon uitsluitend ongedaan maken door de fabrieksinstellingen te herstellen. Daarbij worden al uw gegevens gewist."\n\n"Het versleutelen kan een uur of langer duren. U moet beginnen met een volledig opgeladen accu en u moet de telefoon aansluiten op de oplader totdat het versleutelen is voltooid. Als u het versleutelen onderbreekt, kunt u sommige of al uw gegevens kwijtraken."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"U kunt uw account, instellingen, gedownloade apps en de bijbehorende gegevens, media en andere bestanden versleutelen. Zodra u uw tablet heeft versleuteld, moet u telkens een pincode of wachtwoord opgeven om de tablet te coderen wanneer u deze opstart. U kunt het versleutelen van uw tablet uitsluitend ongedaan maken door de fabrieksinstellingen te herstellen. Daarbij worden al uw gegevens gewist.\n\nHet versleutelen kan een uur of langer duren. U moet beginnen met een volledig opgeladen accu en de tablet moet gedurende het versleutelen op de oplader zijn aangesloten. Als u het versleutelen onderbreekt, kunt u sommige of al uw gegevens kwijtraken."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"U kunt uw account, instellingen, gedownloade apps en de bijbehorende gegevens, media en andere bestanden versleutelen. Zodra u uw telefoon heeft versleuteld, moet u telkens een pincode of wachtwoord opgeven om de telefoon te coderen wanneer u deze opstart. U kunt het versleutelen van uw telefoon uitsluitend ongedaan maken door de fabrieksinstellingen te herstellen. Daarbij worden al uw gegevens gewist.\n\nHet versleutelen kan een uur of langer duren. U moet beginnen met een volledig opgeladen accu en u moet de telefoon aansluiten op de oplader totdat het versleutelen is voltooid. Als u het versleutelen onderbreekt, kunt u sommige of al uw gegevens kwijtraken."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tablet versleutelen"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefoon versleutelen"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laad de accu op en probeer het opnieuw."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Probeer het over <xliff:g id="DELAY">^1</xliff:g> seconden opnieuw."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Typ uw wachtwoord"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encryptie mislukt"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Het coderen is onderbroken en kan niet worden voltooid. Als gevolg hiervan zijn de gegevens op uw tablet niet meer toegankelijk. "\n\n"Als u uw tablet weer wilt gebruiken, moet u de fabrieksinstellingen herstellen. Wanneer u de tablet instelt na het herstel, krijgt u de mogelijkheid gegevens waarvan u een back-up heeft gemaakt in uw Google-account, terug te zetten."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Het coderen is onderbroken en kan niet worden voltooid. Daardoor zijn de gegevens op uw telefoon niet meer toegankelijk. "\n\n"Als u uw telefoon weer wilt gebruiken, moet u de fabrieksinstellingen herstellen. Wanneer u de telefoon instelt na het herstel, krijgt u de mogelijkheid gegevens terug te zetten waarvan u een back-up heeft gemaakt in uw Google-account."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Het coderen is onderbroken en kan niet worden voltooid. Als gevolg hiervan zijn de gegevens op uw tablet niet meer toegankelijk. \n\nAls u uw tablet weer wilt gebruiken, moet u de fabrieksinstellingen herstellen. Wanneer u de tablet instelt na het herstel, krijgt u de mogelijkheid gegevens waarvan u een back-up heeft gemaakt in uw Google-account, terug te zetten."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Het coderen is onderbroken en kan niet worden voltooid. Daardoor zijn de gegevens op uw telefoon niet meer toegankelijk. \n\nAls u uw telefoon weer wilt gebruiken, moet u de fabrieksinstellingen herstellen. Wanneer u de telefoon instelt na het herstel, krijgt u de mogelijkheid gegevens terug te zetten waarvan u een back-up heeft gemaakt in uw Google-account."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Invoermethode schakelen"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Schermvergr. kiezen"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Back-upvergr. kiezen"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Verbinding maken"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Verbonden"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Beschikbaar"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"In gebruik"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Weergave-instellingen"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Ontkoppelen?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Hierdoor wordt uw verbinding met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; verbroken"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Uit"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Niet beschikbaar omdat NFC is uitgeschakeld"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Wanneer deze functie is ingeschakeld, kunt u app-inhoud overbrengen naar een ander NFC-apparaat door de apparaten bij elkaar te houden. U kunt bijvoorbeeld browserpagina\'s, YouTube-video\'s, contacten uit Personen, en nog veel meer overbrengen."\n\n"Houd de apparaten bij elkaar (meestal met de achterkanten tegen elkaar aan) en raak uw scherm aan. De app bepaalt wat er wordt overgebracht."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Wanneer deze functie is ingeschakeld, kunt u app-inhoud overbrengen naar een ander NFC-apparaat door de apparaten bij elkaar te houden. U kunt bijvoorbeeld browserpagina\'s, YouTube-video\'s, contacten uit Personen, en nog veel meer overbrengen.\n\nHoud de apparaten bij elkaar (meestal met de achterkanten tegen elkaar aan) en raak uw scherm aan. De app bepaalt wat er wordt overgebracht."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Netwerkservicedetectie"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Apps op andere apparaten toestaan apps op dit apparaat te detecteren"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wifi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Beveiligd met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", beveiligd met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Geen"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Om de locatieprecisie te verbeteren en voor andere doeleinden, wil <xliff:g id="APP_NAME">%1$s</xliff:g> de netwerkscan inschakelen, zelfs als wifi is uitgeschakeld."\n\n"Dit toestaan voor alle apps die willen scannen?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Om de locatieprecisie te verbeteren en voor andere doeleinden, wil <xliff:g id="APP_NAME">%1$s</xliff:g> de netwerkscan inschakelen, zelfs als wifi is uitgeschakeld.\n\nDit toestaan voor alle apps die willen scannen?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Toestaan"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Afwijzen"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Verbinden"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"WAARSCHUWING: er worden mogelijk extra kosten voor dataverkeer in rekening gebracht.\n\nHet instellen van de tablet kan aanzienlijke netwerkactiviteit vereisen."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"WAARSCHUWING: er worden mogelijk extra kosten voor dataverkeer in rekening gebracht.\n\nHet instellen van de telefoon kan aanzienlijke netwerkactiviteit vereisen."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"LET OP: totdat u een internetverbinding heeft, kan de tablet niet verifiëren dat uw software actueel is."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"LET OP: totdat u een internetverbinding heeft, kan de telefoon niet verifiëren dat uw software actueel is."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"De tablet kan geen verbinding maken met dit wifi-netwerk."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN-code"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Onjuiste pincode"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Pincodes komen niet overeen"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Kan pincode niet wijzigen."\n"Pincode mogelijk onjuist."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Kan pincode niet wijzigen.\nPincode mogelijk onjuist."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN-code gewijzigd"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Kan status van simkaartblokkering niet wijzigen."\n"Pincode mogelijk onjuist."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Kan status van simkaartblokkering niet wijzigen.\nPincode mogelijk onjuist."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Annuleren"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tabletstatus"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrieksinstellingen terug"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Alle gegevens op de tablet wissen"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Alle gegevens op de telefoon wissen"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van uw tablet gewist, waaronder:"\n\n<li>"Uw Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van uw telefoon gewist, waaronder:"\n\n<li>"Uw Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"U bent momenteel aangemeld bij de volgende accounts:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van uw tablet gewist, waaronder:\n\n"<li>"Uw Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van uw telefoon gewist, waaronder:\n\n"<li>"Uw Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"U bent momenteel aangemeld bij de volgende accounts:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muziek"</li>\n<li>"Foto\'s"</li>\n<li>"Andere gebruikersgegevens"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Als u muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"USB-opslag"</b>" worden gewist."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Als u muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"SD-kaart"</b>" worden gewist."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Gecachte processen weerg."</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Appvoorkeuren herstellen"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Appvoorkeuren herstellen?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Hierdoor worden alle voorkeuren voor de volgende items opnieuw ingesteld:"\n\n" "<li>"Uitgeschakelde apps"</li>\n" "<li>"Meldingen van uitgeschakelde apps"</li>\n" "<li>"Standaardapps voor acties"</li>\n" "<li>"Beperkingen voor achtergrondgegevens van apps"</li>\n\n" Er gaan geen appgegevens verloren."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Hierdoor worden alle voorkeuren voor de volgende items opnieuw ingesteld:\n\n "<li>"Uitgeschakelde apps"</li>\n" "<li>"Meldingen van uitgeschakelde apps"</li>\n" "<li>"Standaardapps voor acties"</li>\n" "<li>"Beperkingen voor achtergrondgegevens van apps"</li>\n\n" Er gaan geen appgegevens verloren."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Apps herstellen"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Ruimte beheren"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Druk op Ctrl-spatiebalk om te schakelen"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Standaard"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Toetsenbordindelingen"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Gebruikerswoordenboek"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Persoonlijk woordenboek"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Persoonlijke woordenboeken"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Persoonlijk woordenboek"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Toevoegen"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Toevoegen aan woordenboek"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Optie opnemen in afsluitmenu voor het genereren van een foutenrapport"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Stand-by"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Scherm gaat nooit uit tijdens het opladen"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Snoop-logbestand voor Bluetooth-HCI inschakelen"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Alle Bluetooth-HCI-pakketten tot één bestand samenvoegen"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Runtime selecteren"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Runtime selecteren"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Opnieuw opstarten om runtime te wijzigen van <xliff:g id="OLD">%1$s</xliff:g> in <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Neplocaties toestaan"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Neplocaties toestaan"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB-foutopsporing toestaan?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USB-opslag beveiligen"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Apps moeten toestemming vragen om de USB-opslag te lezen"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"USB-opslag beveiligen?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Wanneer de USB-opslag is beveiligd, moeten apps toestemming vragen om gegevens op externe opslagmedia te lezen."\n\n"Sommige apps werken mogelijk pas nadat ze zijn bijgewerkt door hun ontwikkelaars."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Wanneer de USB-opslag is beveiligd, moeten apps toestemming vragen om gegevens op externe opslagmedia te lezen.\n\nSommige apps werken mogelijk pas nadat ze zijn bijgewerkt door hun ontwikkelaars."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"SD-kaart beveiligen"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Apps moeten toestemming vragen om de SD-kaart te lezen"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SD-kaart beveiligen?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wanneer de SD-kaart is beveiligd, moeten apps toestemming vragen om gegevens op externe opslagmedia te lezen."\n\n"Sommige apps werken mogelijk pas nadat ze zijn bijgewerkt door hun ontwikkelaars."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wanneer de SD-kaart is beveiligd, moeten apps toestemming vragen om gegevens op externe opslagmedia te lezen.\n\nSommige apps werken mogelijk pas nadat ze zijn bijgewerkt door hun ontwikkelaars."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokale terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Terminal-app inschakelen die lokale shell-toegang biedt"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Gadget kiezen"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Widget kiezen"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Widget maken en toegang toestaan?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Services"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Systeem"</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_screen_magnification_summary" msgid="2380627654189671754">"Wanneer deze functie is ingeschakeld, kunt u in- en uitzoomen door drie keer op het scherm te tikken.\n\nWanneer u bent ingezoomd, kunt u:\n"<ul><li>"Pannen: sleep twee of meer vingers over het scherm."</li>\n<li>"Zoomniveau aanpassen: knijp twee of meer vingers samen of spreid deze."</li></ul>\n\n"U kunt ook de inhoud onder uw vinger tijdelijk vergroten door drie keer te tikken en vast te houden. In deze vergrote staat kunt u slepen met uw vinger om verschillende gedeelten van het scherm te verkennen. Til uw vinger op om terug te keren naar de vorige staat.\n\nOpmerking: drie keer tikken voor vergroting werkt overal, behalve voor het toetsenbord en de navigatiebalk."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Snelkoppeling voor toegankelijkheid"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Aan"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Uit"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Wanneer deze functie is ingeschakeld, kunt u de toegankelijkheidsfuncties inschakelen in twee snelle stappen:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Wanneer deze functie is ingeschakeld, kunt u de toegankelijkheidsfuncties inschakelen in twee snelle stappen:\n\nStap 1: Houd de aan/uit-knop ingedrukt totdat u een geluid hoort of een trilling voelt.\n\nStap 2: Blijf het scherm met twee vingers aanraken totdat u een audiobevestiging hoort.\n\nAls het apparaat meerdere gebruikers heeft, wordt toegankelijkheid tijdelijk ingeschakeld met deze snelkoppeling op het vergrendelingsscherm totdat het apparaat wordt ontgrendeld."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Grote tekst"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Schermvergroting"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Schermvergroting automatisch bijwerken"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack levert gesproken feedback om blinde en slechtziende gebruikers te helpen navigeren. Wilt u deze app gratis installeren via Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Geen beschrijving opgegeven."</string>
     <string name="settings_button" msgid="3006713718908152930">"Instellingen"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Afdrukken"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Afdrukinstellingen"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Services"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> gebruiken?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> kan documenten ontvangen die u afdrukt. Dergelijke documenten kunnen gevoelige gegevens bevatten."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Geen services geïnstalleerd"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Instellingen"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Printers toevoegen"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Aan"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Uit"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Accu"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Waarvoor de accu is gebruikt"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Accugebruikgegevens niet beschikbaar."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wifi actief"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefoon"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Gegevens verzonden"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Gegevens ontvangen"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Mobiele gegevens verzonden"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Mobiele gegevens ontvangen"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Wifi-gegevens verzonden"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Wifi-gegevens ontvangen"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tijd actief"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Hoogte"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Is van invloed op de toon van de gesproken tekst"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Taal"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Taal niet geselecteerd"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"De taalspecifieke stem voor de gesproken tekst instellen"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Luisteren naar een voorbeeld"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Een korte demonstratie van spraaksynthese afspelen"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP wordt niet ondersteund."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"U kunt een wifi-verbinding van het type EAP niet configureren tijdens het instellen. U kunt dit na het instellen doen via \'Instellingen\' &gt; \'Draadloos en netwerken\'."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Verbinding maken kan enkele minuten duren..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Raak "<b>"Volgende"</b>" aan om door te gaan met de configuratie."\n\n"Raak "<b>"Terug"</b>" aan om verbinding te maken met een ander wifi-netwerk."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Raak "<b>"Volgende"</b>" aan om door te gaan met de configuratie.\n\nRaak "<b>"Terug"</b>" aan om verbinding te maken met een ander wifi-netwerk."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronisatie is ingeschakeld"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchroniseren uitgeschakeld"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Synchronisatiefout."</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Agenda"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Contacten"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welkom bij Google Sync!"</font>" "\n"Een benadering van Google voor de synchronisatie van gegevens, zodat u altijd en overal toegang heeft tot uw contacten, afspraken en nog veel meer."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welkom bij Google Sync!"</font>" \nEen benadering van Google voor de synchronisatie van gegevens, zodat u altijd en overal toegang heeft tot uw contacten, afspraken en nog veel meer."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Synchronisatie-instellingen van de app"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Gegevens en synchronisatie"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Wachtwoord wijzigen"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Foutopsporing GPU-overbelasting"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW-overlays uitschakelen"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"GPU altijd gebruiken voor schermcompositing"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL-sporen inschakelen"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Achtergrondgegevens in mobiele netwerken uitschakelen. Zo mogelijk worden niet-mobiele netwerken gebruikt."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Als u achtergrondgegevens wilt beperken voor deze app, moet u eerst een mobiele gegevenslimiet instellen."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Achtergrondgegevens beperken?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Deze functie kan ervoor zorgen dat een app die afhankelijk is van achtergrondgegevens, stopt als er alleen mobiele netwerken beschikbaar zijn."\n\n"U kunt meer geschikte besturingselementen voor gegevensgebruik vinden in de instellingen van de app."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Deze functie kan ervoor zorgen dat een app die afhankelijk is van achtergrondgegevens, stopt als er alleen mobiele netwerken beschikbaar zijn.\n\nU kunt meer geschikte besturingselementen voor gegevensgebruik vinden in de instellingen van de app."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"U kunt achtergrondgegevens alleen beperken als u een mobiele gegevenslimiet heeft ingesteld."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Auto-sync gegevens inschakelen?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Wijzigingen die u aanbrengt in uw accounts op internet worden automatisch naar uw tablet gekopieerd."\n\n"Sommige accounts kunnen de wijzigingen die u op uw telefoon aanbrengt ook automatisch naar het account op internet kopiëren. Een Google-account werkt op deze manier."\n\n"Ga naar \'Instellingen\' &gt; \'Accounts\' om te selecteren welke typen gegevens u met elk account wilt synchroniseren."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Wijzigingen die u aanbrengt in uw accounts op internet worden automatisch naar uw telefoon gekopieerd."\n\n"Sommige accounts kunnen de wijzigingen die u op uw telefoon aanbrengt ook automatisch naar het account op internet kopiëren. Een Google-account werkt op deze manier."\n\n"Ga naar \'Instellingen\' &gt; \'Accounts\' om te selecteren welke typen gegevens u met elk account wilt synchroniseren."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Wijzigingen die u aanbrengt in uw accounts op internet worden automatisch naar uw tablet gekopieerd.\n\nSommige accounts kunnen de wijzigingen die u op uw telefoon aanbrengt ook automatisch naar het account op internet kopiëren. Een Google-account werkt op deze manier.\n\nGa naar \'Instellingen\' &gt; \'Accounts\' om te selecteren welke typen gegevens u met elk account wilt synchroniseren."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Wijzigingen die u aanbrengt in uw accounts op internet worden automatisch naar uw telefoon gekopieerd.\n\nSommige accounts kunnen de wijzigingen die u op uw telefoon aanbrengt ook automatisch naar het account op internet kopiëren. Een Google-account werkt op deze manier.\n\nGa naar \'Instellingen\' &gt; \'Accounts\' om te selecteren welke typen gegevens u met elk account wilt synchroniseren."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Auto-sync gegevens uitschakelen?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Hiermee beperkt u gegevens- en accugebruik. U moet elk account echter handmatig synchroniseren om recente informatie te verzamelen. U ontvangt geen meldingen wanneer er updates zijn."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Herzieningsdatum voor gebruikscyclus"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Waarschuwing voor gegevensverbruik instellen"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Limiet voor gegevensverbruik instellen"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Gegevensgebruik beperken"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Uw mobiele gegevensverbinding wordt uitgeschakeld wanneer de gespecificeerde limiet is bereikt."\n\n"Aangezien dit gegevensverbruik wordt gemeten door uw tablet en uw provider tot een ander totaal kan komen, kunt u het beste een voorzichtige grens instellen."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Uw mobiele gegevensverbinding wordt uitgeschakeld wanneer de gespecificeerde limiet is bereikt."\n\n"Aangezien dit gegevensverbruik wordt gemeten door uw telefoon en uw provider tot een ander totaal kan komen, kunt u het beste een voorzichtige grens instellen."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Uw mobiele gegevensverbinding wordt uitgeschakeld wanneer de gespecificeerde limiet is bereikt.\n\nAangezien dit gegevensverbruik wordt gemeten door uw tablet en uw provider tot een ander totaal kan komen, kunt u het beste een voorzichtige grens instellen."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Uw mobiele gegevensverbinding wordt uitgeschakeld wanneer de gespecificeerde limiet is bereikt.\n\nAangezien dit gegevensverbruik wordt gemeten door uw telefoon en uw provider tot een ander totaal kan komen, kunt u het beste een voorzichtige grens instellen."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Achtergrondgegevens beperken?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Als u het gebruik van mobiele achtergrondgegevens beperkt, werken sommige apps en services niet, tenzij u bent verbonden met een wifi-netwerk."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Als u mobiel gegevensgebruik op de achtergrond beperkt, werken sommige apps en services niet, tenzij u verbonden bent met een wifi-netwerk."\n\n"Deze instelling is van invloed op alle gebruikers van deze tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Als u mobiel gegevensgebruik op de achtergrond beperkt, werken sommige apps en services niet, tenzij u verbonden bent met een wifi-netwerk."\n\n"Deze instelling is van invloed op alle gebruikers van deze telefoon."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Als u mobiel gegevensgebruik op de achtergrond beperkt, werken sommige apps en services niet, tenzij u verbonden bent met een wifi-netwerk.\n\nDeze instelling is van invloed op alle gebruikers van deze tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Als u mobiel gegevensgebruik op de achtergrond beperkt, werken sommige apps en services niet, tenzij u verbonden bent met een wifi-netwerk.\n\nDeze instelling is van invloed op alle gebruikers van deze telefoon."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"waarschuwing"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limiet"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Verwijderde apps"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Gebruiker"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Beperkt profiel"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Nieuwe gebruiker toevoegen"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"U kunt dit apparaat met andere mensen delen door extra gebruikers te maken. Elke gebruiker heeft een eigen ruimte die kan worden aangepast met eigen apps, een achtergrond, enzovoort. Gebruikers kunnen ook tabletinstellingen aanpassen, zoals wifi, die effect hebben op alle gebruikers."\n\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_add_user_message_long" msgid="3086244205384741788">"U kunt dit apparaat met andere mensen delen door extra gebruikers te maken. Elke gebruiker heeft een eigen ruimte die kan worden aangepast met eigen apps, een achtergrond, enzovoort. Gebruikers kunnen ook tabletinstellingen aanpassen, zoals wifi, die effect hebben op alle gebruikers.\n\nNadat u een nieuwe gebruiker heeft gemaakt, moet die persoon een configuratieproces volgen.\n\nElke gebruiker kan namens alle andere gebruikers bijgewerkte app-machtigingen accepteren."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Nadat u een nieuwe gebruiker heeft gemaakt, moet die persoon een configuratieproces volgen.\n\nElke gebruiker kan namens alle andere gebruikers bijgewerkte app-machtigingen accepteren."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Gebruiker nu instellen?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Zorg ervoor dat de persoon de tablet kan overnemen om zijn of haar eigen gedeelte te configureren"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Profiel nu instellen?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Deze instelling is van invloed op alle gebruikers van deze telefoon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Taal wijzigen"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Lettergrootte wijzigen"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Beperkingen"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Beperkingen verwijderen"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Pincode wijzigen"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Meldingen weergeven"</string>
     <string name="help_label" msgid="1107174367904110532">"Help"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Account voor inhoud"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 1a10173f4d3..81801720668 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Lokalizacja"</item>
     <item msgid="255608127647030286">"Osobiste"</item>
     <item msgid="4588829735729884491">"Wiadomości"</item>
-    <item msgid="8971765125227378270">"Urządzenie"</item>
+    <item msgid="886742181977884584">"Multimedia"</item>
+    <item msgid="7924928667052300589">"Urządzenie"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"przybliżona lokalizacja"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"odtwórz dźwięk"</item>
     <item msgid="8374996688066472414">"czytaj schowek"</item>
     <item msgid="3045529469061083747">"modyfikuj schowek"</item>
+    <item msgid="5124443975763747838">"przyciski multimediów"</item>
+    <item msgid="4547883971364273343">"aktywność audio"</item>
+    <item msgid="2603878814882344450">"głośność główna"</item>
+    <item msgid="7136963238377062018">"głośność mowy"</item>
+    <item msgid="4270236897655923007">"głośność dzwonka"</item>
+    <item msgid="6325739889222559394">"głośność multimediów"</item>
+    <item msgid="5762123934816216821">"głośność alarmu"</item>
+    <item msgid="785049718065337473">"głośność powiadomień"</item>
+    <item msgid="6700305533746877052">"głośność Bluetooth"</item>
+    <item msgid="2029227495214047094">"utrzymanie aktywności"</item>
+    <item msgid="26109888160231211">"monitorowanie lokalizacji"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokalizacja"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Odtwórz dźwięk"</item>
     <item msgid="136815868796597058">"Czytaj schowek"</item>
     <item msgid="5238692940326972503">"Modyfikuj schowek"</item>
+    <item msgid="5753789168376302997">"Przyciski multimediów"</item>
+    <item msgid="3265262911688671938">"Aktywność audio"</item>
+    <item msgid="2098976479485046797">"Głośność główna"</item>
+    <item msgid="5660213838861789350">"Głośność mowy"</item>
+    <item msgid="7983336752371254444">"Głośność dzwonka"</item>
+    <item msgid="7878027809189330917">"Głośność multimediów"</item>
+    <item msgid="7260546305036218513">"Głośność alarmu"</item>
+    <item msgid="9103719301075748925">"Głośność powiadomień"</item>
+    <item msgid="7025966722295861512">"Głośność Bluetooth"</item>
+    <item msgid="4665183401128289653">"Utrzymanie aktywności"</item>
+    <item msgid="8584357129746649222">"Lokalizacja"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krótkie"</item>
     <item msgid="2560532955514699713">"Średnie"</item>
     <item msgid="2372711992605524591">"Długie"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (debugowanie)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Użyj Dalvik"</item>
+    <item msgid="5131846588686178907">"Użyj ART"</item>
+    <item msgid="4530003713865319928">"Użyj komplikacji debugowania ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nigdy nie sprawdzaj"</item>
     <item msgid="6042769699089883931">"Sprawdzaj tylko w przypadku treści chronionych DRM"</item>
@@ -357,16 +390,21 @@
     <item msgid="1340692776955662664">"Stos wywołań funkcji glGetError"</item>
   </string-array>
   <string-array name="show_non_rect_clip_entries">
-    <item msgid="993742912147090253">"Wył."</item>
+    <item msgid="993742912147090253">"Wyłączone"</item>
     <item msgid="675719912558941285">"Rysuj nieprostokątny region przycinania na niebiesko"</item>
     <item msgid="1064373276095698656">"Wyróżnij testowane polecenia rysowania na zielono"</item>
   </string-array>
   <string-array name="track_frame_time_entries">
-    <item msgid="2193584639058893150">"Wył."</item>
+    <item msgid="2193584639058893150">"Wyłączone"</item>
     <item msgid="2751513398307949636">"Na ekranie w postaci pasków"</item>
     <item msgid="8272260411216018353">"Na ekranie w postaci linii"</item>
     <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Wył."</item>
+    <item msgid="7688197031296835369">"Pokaż przerysowywane obszary"</item>
+    <item msgid="8332661909019981149">"Pokaż licznik przerysowań"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardowy limit"</item>
     <item msgid="4071574792028999443">"Brak procesów w tle"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 0c665e48d78..d088142d1a9 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Po zezwoleniu na przesyłanie danych w roamingu mogą zostać naliczone znaczne opłaty za roaming.\n\nTo ustawienie obowiązuje wszystkich użytkowników tego tabletu."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Po zezwoleniu na przesyłanie danych w roamingu mogą zostać naliczone znaczne opłaty za roaming.\n\nTo ustawienie obowiązuje wszystkich użytkowników tego telefonu."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Zezwalać na roaming danych?"</string>
     <string name="networks" msgid="6333316876545927039">"Wybór operatora"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Wybierz operatora sieci."</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Wymagaj podania kodu PIN lub hasła w celu odszyfrowania tabletu przy każdym uruchomieniu"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Wymagaj podania kodu PIN lub hasła w celu odszyfrowania telefonu przy każdym uruchomieniu"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Zaszyfrowane"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje i ich dane, multimedia oraz inne pliki. Po zaszyfrowaniu tabletu musisz wpisać numeryczny kod PIN lub hasło do odszyfrowania po każdym włączeniu urządzenia. Tablet można odszyfrować jedynie przez przywrócenie danych fabrycznych i usunięcie wszystkich swoich danych."\n\n"Szyfrowanie może potrwać godzinę lub dłużej. Rozpocznij, gdy bateria jest w pełni naładowana i nie odłączaj tabletu od zasilania do chwili ukończenia szyfrowania. Jeśli proces zostanie przerwany, utracisz część lub nawet wszystkie swoje dane."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje i ich dane, multimedia oraz inne pliki. Po zaszyfrowaniu telefonu musisz wpisać numeryczny kod PIN lub hasło do odszyfrowania po każdym włączeniu urządzenia. Telefon można odszyfrować jedynie przez przywrócenie danych fabrycznych i usunięcie wszystkich swoich danych."\n\n"Szyfrowanie może potrwać godzinę lub dłużej. Rozpocznij, gdy bateria jest w pełni naładowana i nie odłączaj telefonu od zasilania do chwili ukończenia szyfrowania. Jeśli proces zostanie przerwany, utracisz część lub nawet wszystkie swoje dane."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje i ich dane, multimedia oraz inne pliki. Po zaszyfrowaniu tabletu musisz wpisać numeryczny kod PIN lub hasło do odszyfrowania po każdym włączeniu urządzenia. Tablet można odszyfrować jedynie przez przywrócenie danych fabrycznych i usunięcie wszystkich swoich danych.\n\nSzyfrowanie może potrwać godzinę lub dłużej. Rozpocznij, gdy bateria jest w pełni naładowana i nie odłączaj tabletu od zasilania do chwili ukończenia szyfrowania. Jeśli proces zostanie przerwany, utracisz część lub nawet wszystkie swoje dane."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje i ich dane, multimedia oraz inne pliki. Po zaszyfrowaniu telefonu musisz wpisać numeryczny kod PIN lub hasło do odszyfrowania po każdym włączeniu urządzenia. Telefon można odszyfrować jedynie przez przywrócenie danych fabrycznych i usunięcie wszystkich swoich danych.\n\nSzyfrowanie może potrwać godzinę lub dłużej. Rozpocznij, gdy bateria jest w pełni naładowana i nie odłączaj telefonu od zasilania do chwili ukończenia szyfrowania. Jeśli proces zostanie przerwany, utracisz część lub nawet wszystkie swoje dane."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Zaszyfruj tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Zaszyfruj telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Naładuj baterię i spróbuj ponownie."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Spróbuj ponownie za <xliff:g id="DELAY">^1</xliff:g> s."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Wpisz swoje hasło."</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Szyfrowanie zakończone niepowodzeniem"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Szyfrowanie zostało przerwane i nie można go dokończyć. Z tego powodu dane znajdujące się w tablecie nie są już dostępne. "\n\n"Aby dalej używać tabletu, musisz przywrócić dane fabryczne. Podczas konfigurowania po zresetowaniu będziesz mieć możliwość przywrócenia wszelkich danych, których kopia zapasowa została utworzona na koncie Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Szyfrowanie zostało przerwane i nie można go dokończyć. Z tego powodu dane znajdujące się w telefonie nie są już dostępne. "\n\n"Aby dalej używać telefonu, musisz przywrócić dane fabryczne. Podczas konfigurowania po zresetowaniu będziesz mieć możliwość przywrócenia wszelkich danych, których kopia zapasowa została utworzona na koncie Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Szyfrowanie zostało przerwane i nie można go dokończyć. Z tego powodu dane znajdujące się w tablecie nie są już dostępne. \n\nAby dalej używać tabletu, musisz przywrócić dane fabryczne. Podczas konfigurowania po zresetowaniu będziesz mieć możliwość przywrócenia wszelkich danych, których kopia zapasowa została utworzona na koncie Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Szyfrowanie zostało przerwane i nie można go dokończyć. Z tego powodu dane znajdujące się w telefonie nie są już dostępne. \n\nAby dalej używać telefonu, musisz przywrócić dane fabryczne. Podczas konfigurowania po zresetowaniu będziesz mieć możliwość przywrócenia wszelkich danych, których kopia zapasowa została utworzona na koncie Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Przełącz metodę wprowadzania"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Wybierz blokadę ekranu"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Wybierz blokadę zapasową"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Łączenie"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Połączony"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Dostępny"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"W użyciu"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Ustawienia wyświetlacza"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Rozłączyć?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Spowoduje to zakończenie połączenia z:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Wyłączona"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Niedostępne przy wyłączonym NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Po włączeniu tej funkcji możesz przesyłać dane między urządzeniami z funkcją NFC, zbliżając oba aparaty do siebie. Możliwe jest na przykład przesłanie stron z przeglądarki, filmów z YouTube, kontaktów z telefonu itp."\n\n"Wystarczy zetknąć urządzenia ze sobą i dotknąć ekranu. Aplikacja automatycznie określi, jakie dane chcesz przesłać."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Po włączeniu tej funkcji możesz przesyłać dane między urządzeniami z funkcją NFC, zbliżając oba aparaty do siebie. Możliwe jest na przykład przesłanie stron z przeglądarki, filmów z YouTube, kontaktów z telefonu itp.\n\nWystarczy zetknąć urządzenia ze sobą i dotknąć ekranu. Aplikacja automatycznie określi, jakie dane chcesz przesłać."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Wykrywanie usług sieciowych"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Zezwól aplikacjom z innych urządzeń wykrywać aplikacje na tym urządzeniu"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zabezpieczona za pomocą protokołu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpieczona za pomocą protokołu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Brak"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aby poprawić dokładność lokalizacji (i w innych celach), <xliff:g id="APP_NAME">%1$s</xliff:g> chce włączyć skanowanie sieci – nawet gdy Wi-Fi jest wyłączone."\n\n"Zezwolić na to wszystkim aplikacjom, które chcą wykonywać skanowanie?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aby poprawić dokładność lokalizacji (i w innych celach), <xliff:g id="APP_NAME">%1$s</xliff:g> chce włączyć skanowanie sieci – nawet gdy Wi-Fi jest wyłączone.\n\nZezwolić na to wszystkim aplikacjom, które chcą wykonywać skanowanie?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Zezwól"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Odrzuć"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Połącz"</string>
@@ -632,8 +633,8 @@
     <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ć przesłania dużej ilości informacji."</string>
-    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"OSTRZEŻENIE: operator może naliczyć dodatkowe opłaty za transmisję danych."\n\n"Konfiguracja telefonu może wymagać przesłania dużej ilości informacji."</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"OSTRZEŻENIE: operator może naliczyć dodatkowe opłaty za transmisję danych.\n\nKonfiguracja tabletu może wymagać przesłania dużej ilości informacji."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"OSTRZEŻENIE: operator może naliczyć dodatkowe opłaty za transmisję danych.\n\nKonfiguracja telefonu może wymagać przesłania dużej ilości informacji."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"OSTRZEŻENIE: aby sprawdzić, czy oprogramowanie jest aktualne, tablet musi mieć połączenie z internetem."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"OSTRZEŻENIE: aby sprawdzić, czy oprogramowanie jest aktualne, telefon musi mieć połączenie z internetem."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet nie może nawiązać połączenia z tą siecią Wi-Fi."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"Kod PIN do karty SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Błędny kod PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Kody PIN nie są identyczne."</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Nie można zmienić kodu PIN."\n"Wpisany kod PIN może być błędny."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Nie można zmienić kodu PIN.\nWpisany kod PIN może być błędny."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Kod PIN do karty SIM został pomyślnie zmieniony"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Nie można zmienić stanu blokady karty SIM."\n"Wpisany kod PIN może być błędny."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Nie można zmienić stanu blokady karty SIM.\nWpisany kod PIN może być błędny."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Anuluj"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stan tabletu"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Ustawienia fabryczne"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Wymazuje wszystkie dane z tabletu"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Wymazuje wszystkie dane w telefonie"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Zostaną usunięte wszystkie dane z "<b>"wewnętrznej pamięci"</b>" tabletu, w tym:"\n\n<li>"Dane konta Google"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji"</li>\n<li>"Pobrane aplikacje"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Zostaną usunięte wszystkie dane z "<b>"wewnętrznej pamięci"</b>" telefonu, w tym:"\n\n<li>"Dane konta Google"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji"</li>\n<li>"Pobrane aplikacje"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Zalogowano się na konta:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Zostaną usunięte wszystkie dane z "<b>"wewnętrznej pamięci"</b>" tabletu, w tym:\n\n"<li>"Dane konta Google"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji"</li>\n<li>"Pobrane aplikacje"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Zostaną usunięte wszystkie dane z "<b>"wewnętrznej pamięci"</b>" telefonu, w tym:\n\n"<li>"Dane konta Google"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji"</li>\n<li>"Pobrane aplikacje"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Zalogowano się na konta:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzyka"</li>\n<li>"Zdjęcia"</li>\n<li>"Inne dane użytkownika"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"nośnik USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"kartę SD"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Pokaż procesy z pamięci podręcznej"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Resetuj opcje aplikacji"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Zresetować opcje aplikacji?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Zresetowane będą wszystkie ustawienia:"\n\n" "<li>"Wyłączone aplikacje"</li>\n" "<li>"Wyłączone powiadomienia aplikacji"</li>\n" "<li>"Aplikacje domyślne"</li>\n" "<li>"Ograniczenia użycia danych w tle dla aplikacji."</li>\n\n" Nie utracisz żadnych danych."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Zresetowane będą wszystkie ustawienia:\n\n "<li>"Wyłączone aplikacje"</li>\n" "<li>"Wyłączone powiadomienia aplikacji"</li>\n" "<li>"Aplikacje domyślne"</li>\n" "<li>"Ograniczenia użycia danych w tle dla aplikacji."</li>\n\n" Nie utracisz żadnych danych."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Resetuj aplikacje"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Zarządzaj rozmiarem"</string>
     <string name="filter" msgid="2018011724373033887">"Filtr"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Control-spacja, by przełączyć"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Domyślna"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Układy klawiatury"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Słownik użytkownika"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Słownik osobisty"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Osobiste słowniki"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Słownik osobisty"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Dodaj"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Dodaj do słownika"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Dodaj w menu zasilania opcję zgłaszania błędów"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Pozostaw ekran włączony"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekran nie będzie gaszony podczas ładowania telefonu"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Włącz dziennik analizatora snoop Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Przechwyć wszystkie pakiety Bluetooth HCI do pliku"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Wybierz czas wykonywania"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Wybierz czas wykonywania"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Uruchomić ponownie, by zmienić czas wykonywania z <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Pozorowanie lokalizacji"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Zezwalaj na pozorowanie lokalizacji"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Czy zezwalać na debugowanie USB?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Chroń nośnik USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplikacje muszą prosić o pozwolenie na odczyt nośnika USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Włączyć ochronę nośnika USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Gdy nośnik USB jest chroniony, aplikacje muszą prosić o pozwolenie na odczyt danych z tego nośnika zewnętrznego."\n\n"Niektóre aplikacje mogą przestać działać i wymagać aktualizacji przez programistę."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Gdy nośnik USB jest chroniony, aplikacje muszą prosić o pozwolenie na odczyt danych z tego nośnika zewnętrznego.\n\nNiektóre aplikacje mogą przestać działać i wymagać aktualizacji przez programistę."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Chroń kartę SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikacje muszą prosić o pozwolenie na odczyt karty SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Włączyć ochronę karty SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Gdy karta SD jest chroniona, aplikacje muszą prosić o pozwolenie na odczyt danych z tego nośnika zewnętrznego."\n\n"Niektóre aplikacje mogą przestać działać i wymagać aktualizacji przez programistę."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Gdy karta SD jest chroniona, aplikacje muszą prosić o pozwolenie na odczyt danych z tego nośnika zewnętrznego.\n\nNiektóre aplikacje mogą przestać działać i wymagać aktualizacji przez programistę."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal lokalny"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Włącz terminal, który umożliwia dostęp do powłoki lokalnej"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Wybierz gadżet"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Wybierz widżet"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Utworzyć widżet i zezwolić na dostęp?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Usługi"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</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_screen_magnification_summary" msgid="2380627654189671754">"Kiedy ta funkcja jest włączona, możesz powiększyć i pomniejszyć obraz, trzykrotnie klikając ekran.\n\nW trybie powiększenia możesz:\n"<ul><li>"Przesuwać: przeciągnij palcami po ekranie."</li>\n<li>"Regulować powiększenie: ściągnij lub rozsuń palce."</li></ul>\n\n"Możesz też tymczasowo powiększyć miejsce pod palcem, klikając trzykrotnie i przytrzymując palec na ekranie. W takim widoku „lupy” możesz przesuwać palcem po ekranie i powiększać różne miejsca. Podniesienie palca spowoduje powrót do poprzedniego widoku.\n\nUwaga: trzykrotne kliknięcie powiększające działa wszędzie poza klawiaturą i paskiem nawigacji."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Skrót ułatwień dostępu"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Wł."</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Wył."</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kiedy ta funkcja jest aktywna, możesz szybko włączyć ułatwienia dostępu w dwóch krokach:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Kiedy ta funkcja jest aktywna, możesz szybko włączyć ułatwienia dostępu w dwóch krokach:\n\nKrok 1: naciśnij i przytrzymaj przycisk zasilania, aż usłyszysz sygnał lub poczujesz wibracje.\n\nKrok 2: naciśnij i przytrzymaj ekran dwoma palcami, aż usłyszysz potwierdzenie dźwiękowe.\n\nJeśli z tego urządzenia korzysta kilka osób, użycie tego skrótu na zablokowanym ekranie spowoduje tymczasowe włączenie ułatwień dostępu do momentu zablokowania urządzenia."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Duży tekst"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Powiększenie ekranu"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automatyczna aktualizacja powiększenia ekranu"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack odczytuje zawartość ekranu, pomagając użytkownikom niewidomym i niedowidzącym. Czy chcesz zainstalować tę usługę za darmo z Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Brak opisu"</string>
     <string name="settings_button" msgid="3006713718908152930">"Ustawienia"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Drukowanie"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Ustawienia drukowania"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Usługi"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Użyć usługi <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> może odbierać drukowane przez Ciebie dokumenty, które mogą zawierać poufne dane."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Brak zainstalowanych usług"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Ustawienia"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Dodaj drukarki"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Włączone"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Wyłączone"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Gdzie wykorzystywana jest bateria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Brak danych o zużyciu baterii"</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Praca Wi-Fi"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Dane wysłane"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Dane odebrane"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Dane komórkowe zostały wysłane"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Dane komórkowe zostały odebrane"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Dane Wi‑Fi zostały wysłane"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Dane Wi‑Fi zostały odebrane"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Dźwięk"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Wideo"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Czas włączenia"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tony"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Określa ton czytanego tekstu"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Język"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nie wybrano języka"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Ustawia zależny od języka głos dla czytanych tekstów"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Posłuchaj przykładu"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Odtwórz krótką prezentację syntezy mowy"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"Protokół EAP nie jest obsługiwany."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Ustawień połączenia Wi-Fi z zabezpieczeniami EAP nie można określić podczas konfiguracji. Możesz to zrobić później na ekranie Ustawienia &gt; Sieci bezprzewodowe."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Łączenie może potrwać kilka minut…"</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Kliknij "<b>"Dalej"</b>", by kontynuować konfigurację."\n\n"Kliknij "<b>"Wróć"</b>", by połączyć się z inną siecią Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Kliknij "<b>"Dalej"</b>", by kontynuować konfigurację.\n\nKliknij "<b>"Wróć"</b>", by połączyć się z inną siecią Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronizacja włączona"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronizacja wyłączona"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Błąd synchronizacji"</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalendarz"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kontakty"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Google Sync – witamy!"</font>" "\n"Synchronizacja danych daje Ci dostęp do kontaktów, wydarzeń i innych ważnych informacji z dowolnego miejsca."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Google Sync – witamy!"</font>" \nSynchronizacja danych daje Ci dostęp do kontaktów, wydarzeń i innych ważnych informacji z dowolnego miejsca."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Ustawienia synchronizacji aplikacji"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dane i synchronizacja"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Zmień hasło"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Debuguj przerysowania GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Wyłącz nakładki HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Zawsze używaj GPU do komponowania ekranu"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Włącz śledzenia OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Wyłącz dane w tle w sieciach komórkowych (nadal używaj w innych sieci)."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Transmisję danych w tle możesz ograniczyć po ustawieniu limitu."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Ograniczyć dane w tle?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Gdy będą dostępne tylko sieci komórkowe, funkcja ta może zakłócić działanie aplikacji, które korzystają z przesyłu danych w tle."\n\n"Szczegółowe ustawienia transmisji danych są zazwyczaj dostępne bezpośrednio w poszczególnych aplikacjach."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Gdy będą dostępne tylko sieci komórkowe, funkcja ta może zakłócić działanie aplikacji, które korzystają z przesyłu danych w tle.\n\nSzczegółowe ustawienia transmisji danych są zazwyczaj dostępne bezpośrednio w poszczególnych aplikacjach."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Ograniczenie transmisji danych w tle jest możliwe tylko po ustawieniu limitu komórkowej transmisji danych."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Włączyć autosynchronizację?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Wszystkie zmiany, które wprowadzisz na swoich kontach w sieci, będą automatycznie kopiowane na Twój tablet."\n\n"Niektóre konta mogą też kopiować do sieci wszystkie zmiany, które wprowadzisz na tablecie. W ten sposób działa konto Google."\n\n"Aby wybrać informacje synchronizowane przez poszczególne konta, wyświetl Ustawienia &gt; Konta."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Wszystkie zmiany, które wprowadzisz na swoich kontach w sieci, będą automatycznie kopiowane na Twój telefon."\n\n"Niektóre konta mogą też kopiować do sieci wszystkie zmiany, które wprowadzisz na telefonie. W ten sposób działa konto Google."\n\n"Aby wybrać informacje synchronizowane przez poszczególne konta, wyświetl Ustawienia &gt; Konta."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Wszystkie zmiany, które wprowadzisz na swoich kontach w sieci, będą automatycznie kopiowane na Twój tablet.\n\nNiektóre konta mogą też kopiować do sieci wszystkie zmiany, które wprowadzisz na tablecie. W ten sposób działa konto Google.\n\nAby wybrać informacje synchronizowane przez poszczególne konta, wyświetl Ustawienia &gt; Konta."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Wszystkie zmiany, które wprowadzisz na swoich kontach w sieci, będą automatycznie kopiowane na Twój telefon.\n\nNiektóre konta mogą też kopiować do sieci wszystkie zmiany, które wprowadzisz na telefonie. W ten sposób działa konto Google.\n\nAby wybrać informacje synchronizowane przez poszczególne konta, wyświetl Ustawienia &gt; Konta."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Wyłączyć autosynchronizację?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Powoduje przesyłanie mniejszej ilości danych oraz zmniejsza użycie baterii, ale pobranie najnowszych informacji będzie wymagało ręcznej synchronizacji każdego konta. Poza tym nie będziesz otrzymywać powiadomień o aktualizacjach."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data resetowania cyklu transmisji danych"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Ustaw ostrzeżenie o transmisji danych"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Ustaw limit danych"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograniczanie transmisji danych"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Komórkowe połączenie transmisji danych zostanie wyłączone po wyczerpaniu limitu."\n\n"Ilość przesyłanych danych może być różnie rozliczana przez tablet i operatora, więc warto ustawić nieco niższy limit."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Komórkowe połączenie transmisji danych zostanie wyłączone po wyczerpaniu limitu."\n\n"Ilość przesyłanych danych może być różnie rozliczana przez telefon i operatora, więc warto ustawić nieco niższy limit."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Komórkowe połączenie transmisji danych zostanie wyłączone po wyczerpaniu limitu.\n\nIlość przesyłanych danych może być różnie rozliczana przez tablet i operatora, więc warto ustawić nieco niższy limit."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Komórkowe połączenie transmisji danych zostanie wyłączone po wyczerpaniu limitu.\n\nIlość przesyłanych danych może być różnie rozliczana przez telefon i operatora, więc warto ustawić nieco niższy limit."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Ograniczyć dane w tle?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Jeśli ograniczysz komórkową transmisję danych w tle, niektóre aplikacje i usługi będą działały tylko po połączeniu z siecią Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Jeśli ograniczysz komórkową transmisję danych w tle, niektóre aplikacje i usługi będą działały tylko po połączeniu z siecią Wi-Fi."\n\n"Ustawienie dotyczy wszystkich użytkowników tego tabletu."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Jeśli ograniczysz komórkową transmisję danych w tle, niektóre aplikacje i usługi będą działały tylko po połączeniu z siecią Wi-Fi."\n\n"Ustawienie dotyczy wszystkich użytkowników tego telefonu."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Jeśli ograniczysz komórkową transmisję danych w tle, niektóre aplikacje i usługi będą działały tylko po połączeniu z siecią Wi-Fi.\n\nUstawienie dotyczy wszystkich użytkowników tego tabletu."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Jeśli ograniczysz komórkową transmisję danych w tle, niektóre aplikacje i usługi będą działały tylko po połączeniu z siecią Wi-Fi.\n\nUstawienie dotyczy wszystkich użytkowników tego telefonu."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ostrzeżenie"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limit"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Usunięte aplikacje"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Użytkownik"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil ograniczony"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Dodaj nowego użytkownika"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Możesz korzystać z tego urządzenia wspólnie z innymi osobami, tworząc dodatkowych użytkowników. Każdy użytkownik ma swoje własne miejsce, które może spersonalizować własnymi aplikacjami, tapetą itd. Użytkownicy mogą także zmieniać ustawienia tabletu, które dotyczą wszystkich, np. Wi-Fi."\n\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_add_user_message_long" msgid="3086244205384741788">"Możesz korzystać z tego urządzenia wspólnie z innymi osobami, tworząc dodatkowych użytkowników. Każdy użytkownik ma swoje własne miejsce, które może spersonalizować własnymi aplikacjami, tapetą itd. Użytkownicy mogą także zmieniać ustawienia tabletu, które dotyczą wszystkich, np. Wi-Fi.\n\nPo utworzeniu nowego użytkownika musi on przejść przez proces konfiguracji.\n\nKażdy użytkownik może akceptować zaktualizowane uprawnienia aplikacji w imieniu wszystkich pozostałych użytkowników."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Po utworzeniu nowego użytkownika musi on przejść przez proces konfiguracji.\n\nKażdy użytkownik może akceptować zaktualizowane uprawnienia aplikacji w imieniu wszystkich pozostałych użytkowników."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Skonfigurować ustawienia dla użytkownika?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Upewnij się, że ta osoba jest w pobliżu i może skonfigurować swój profil na tablecie"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Skonfigurować teraz profil?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"To ustawienie obowiązuje wszystkich użytkowników tego telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Zmień język"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Zmień rozmiar czcionki"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Ograniczenia"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Usuń ograniczenia"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Zmień PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Pokaż powiadomienia"</string>
     <string name="help_label" msgid="1107174367904110532">"Pomoc"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Konto na materiały"</string>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 267fe34e687..5a1b002572b 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Local"</item>
     <item msgid="255608127647030286">"Pessoal"</item>
     <item msgid="4588829735729884491">"Mensagens"</item>
-    <item msgid="8971765125227378270">"Dispositivo"</item>
+    <item msgid="886742181977884584">"Multimédia"</item>
+    <item msgid="7924928667052300589">"Dispositivo"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"localização aproximada"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"reproduzir áudio"</item>
     <item msgid="8374996688066472414">"ler área de transferência"</item>
     <item msgid="3045529469061083747">"modificar área de transferência"</item>
+    <item msgid="5124443975763747838">"botões multimédia"</item>
+    <item msgid="4547883971364273343">"orientação do áudio"</item>
+    <item msgid="2603878814882344450">"volume principal"</item>
+    <item msgid="7136963238377062018">"volume de voz"</item>
+    <item msgid="4270236897655923007">"volume de toque"</item>
+    <item msgid="6325739889222559394">"volume de multimédia"</item>
+    <item msgid="5762123934816216821">"volume de alarme"</item>
+    <item msgid="785049718065337473">"volume de notificação"</item>
+    <item msgid="6700305533746877052">"volume de Bluetooth"</item>
+    <item msgid="2029227495214047094">"Manter ativo"</item>
+    <item msgid="26109888160231211">"monitorizar localização"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Localização"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Reproduzir áudio"</item>
     <item msgid="136815868796597058">"Ler área de transferência"</item>
     <item msgid="5238692940326972503">"Modificar área de transferência"</item>
+    <item msgid="5753789168376302997">"Botões multimédia"</item>
+    <item msgid="3265262911688671938">"Orientação do áudio"</item>
+    <item msgid="2098976479485046797">"Volume principal"</item>
+    <item msgid="5660213838861789350">"Volume da voz"</item>
+    <item msgid="7983336752371254444">"Volume do toque"</item>
+    <item msgid="7878027809189330917">"Volume de multimédia"</item>
+    <item msgid="7260546305036218513">"Volume do alarme"</item>
+    <item msgid="9103719301075748925">"Volume de notificações"</item>
+    <item msgid="7025966722295861512">"Volume de Bluetooth"</item>
+    <item msgid="4665183401128289653">"Manter ativo"</item>
+    <item msgid="8584357129746649222">"Localização"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curta"</item>
     <item msgid="2560532955514699713">"Média"</item>
     <item msgid="2372711992605524591">"Longa"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (depurar)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Utilizar Dalvik"</item>
+    <item msgid="5131846588686178907">"Utilizar ART"</item>
+    <item msgid="4530003713865319928">"Utilizar compilação de depuração ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nunca verificar"</item>
     <item msgid="6042769699089883931">"Verificar apenas conteúdo DRM"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"No ecrã como linhas"</item>
     <item msgid="120512413928262547">"Em adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Desativado"</item>
+    <item msgid="7688197031296835369">"Mostrar áreas de sobreposição"</item>
+    <item msgid="8332661909019981149">"Mostrar contador de sobreposições"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite padrão"</item>
     <item msgid="4071574792028999443">"Sem processos em segundo plano"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 71b59676e5e..c860b4f574e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Ao permitir o roaming de dados, podem ser cobradas tarifas de roaming significativas!\n\nEsta definição afeta todos os utilizadores deste tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Ao permitir o roaming de dados, podem ser cobradas tarifas de roaming significativas!\n\nEsta definição afeta todos os utilizadores deste telemóvel."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Permitir roaming de dados?"</string>
     <string name="networks" msgid="6333316876545927039">"Selecção da operadora"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Escolher um operador de rede"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Necessita de um PIN numérico ou de palavra-passe para desencriptar o tablet sempre que o ligar"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Necessita de um PIN numérico ou de palavra-passe para desencriptar o telefone sempre que o ligar"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Pode encriptar contas, definições, aplicações e dados transferidos, ficheiros multimédia e outros ficheiros. Após encriptar o tablet, é necessário introduzir um PIN numérico ou uma palavra-passe para o desencriptar sempre que o ligar. Não é possível desencriptar o tablet, exceto através da realização de uma reposição de dados de fábrica, apagando todos os seus dados."\n\n"A encriptação demora uma hora ou mais. Deve iniciar com uma bateria carregada e manter o tablet ligado até a encriptação estar concluída. Se interromper o processo de encriptação, irá perder alguns ou todos os seus dados."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Pode encriptar contas, definições, aplicações e dados transferidos, ficheiros multimédia e outros ficheiros. Após encriptar o telemóvel, é necessário introduzir um PIN numérico ou uma palavra-passe para o desencriptar sempre que o ligar. Não é possível desencriptar o telemóvel, exceto através da realização de uma reposição de dados de fábrica, apagando todos os seus dados."\n" "\n"A encriptação demora uma hora ou mais. Deve iniciar com uma bateria carregada e manter o telemóvel ligado até a encriptação estar concluída. Se interromper o processo de encriptação, irá perder alguns ou todos os seus dados."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Pode encriptar contas, definições, aplicações e dados transferidos, ficheiros multimédia e outros ficheiros. Após encriptar o tablet, é necessário introduzir um PIN numérico ou uma palavra-passe para o desencriptar sempre que o ligar. Não é possível desencriptar o tablet, exceto através da realização de uma reposição de dados de fábrica, apagando todos os seus dados.\n\nA encriptação demora uma hora ou mais. Deve iniciar com uma bateria carregada e manter o tablet ligado até a encriptação estar concluída. Se interromper o processo de encriptação, irá perder alguns ou todos os seus dados."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Pode encriptar contas, definições, aplicações e dados transferidos, ficheiros multimédia e outros ficheiros. Após encriptar o telemóvel, é necessário introduzir um PIN numérico ou uma palavra-passe para o desencriptar sempre que o ligar. Não é possível desencriptar o telemóvel, exceto através da realização de uma reposição de dados de fábrica, apagando todos os seus dados.\n \nA encriptação demora uma hora ou mais. Deve iniciar com uma bateria carregada e manter o telemóvel ligado até a encriptação estar concluída. Se interromper o processo de encriptação, irá perder alguns ou todos os seus dados."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encriptar tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encriptar telefone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carregue a bateria e tente novamente."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Tente novamente dentro de <xliff:g id="DELAY">^1</xliff:g> segundos."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Introduza a palavra-passe"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encriptação sem êxito"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"A encriptação foi interrompida e não é possível concluí-la. Como resultado, os dados no tablet já não estão acessíveis. "\n\n"Para voltar a utilizar o tablet, é necessário efetuar uma reposição para os valores de fábrica. Quando configurar o tablet após a reposição, poderá restaurar todos os dados dos quais tenha cópias de segurança na Conta Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"A encriptação foi interrompida e não é possível concluí-la. Como resultado, os dados no seu telemóvel já não estão acessíveis. "\n\n"Para voltar a utilizar o telemóvel, é necessário efetuar uma reposição para os valores de fábrica. Quando configurar o telemóvel após a reposição, poderá restaurar todos os dados dos quais tenha cópias de segurança na sua Conta Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"A encriptação foi interrompida e não é possível concluí-la. Como resultado, os dados no tablet já não estão acessíveis. \n\nPara voltar a utilizar o tablet, é necessário efetuar uma reposição para os valores de fábrica. Quando configurar o tablet após a reposição, poderá restaurar todos os dados dos quais tenha cópias de segurança na Conta Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"A encriptação foi interrompida e não é possível concluí-la. Como resultado, os dados no seu telemóvel já não estão acessíveis. \n\nPara voltar a utilizar o telemóvel, é necessário efetuar uma reposição para os valores de fábrica. Quando configurar o telemóvel após a reposição, poderá restaurar todos os dados dos quais tenha cópias de segurança na sua Conta Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Alternar o método de introdução"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Selec. bloq. do ecrã"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Escolher bloq. cópia seg."</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"A ligar"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Ligado"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponível"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Em utilização"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Definições de visualização"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Desligar?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Isto terminará a sua ligação com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desativado"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Não disponível, porque o NFC está desativado"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Quando esta funcionalidade está ativada, pode transmitir o conteúdo da aplicação para outro aparelho com capacidade de NFC mantendo os aparelhos próximos um do outro. Por exemplo, pode transmitir páginas do Navegador, vídeos do YouTube, contactos de Pessoas e muito mais. "\n\n"Basta juntar os aparelhos (normalmente de costas) e, em seguida, tocar no ecrã. A aplicação determina o que é transmitido."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Quando esta funcionalidade está ativada, pode transmitir o conteúdo da aplicação para outro aparelho com capacidade de NFC mantendo os aparelhos próximos um do outro. Por exemplo, pode transmitir páginas do Navegador, vídeos do YouTube, contactos de Pessoas e muito mais. \n\nBasta juntar os aparelhos (normalmente de costas) e, em seguida, tocar no ecrã. A aplicação determina o que é transmitido."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Deteção do serviço de rede"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permitir que aplicações noutros dispositivos detetem aplicações neste dispositivo"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nenhuma"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para melhorar a precisão da localização e para outros fins, <xliff:g id="APP_NAME">%1$s</xliff:g> pretende ativar a verificação de redes, mesmo quando o Wi-Fi está desativado."\n\n"Permitir esta opção para todas as aplicações que pretenderem verificar?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para melhorar a precisão da localização e para outros fins, <xliff:g id="APP_NAME">%1$s</xliff:g> pretende ativar a verificação de redes, mesmo quando o Wi-Fi está desativado.\n\nPermitir esta opção para todas as aplicações que pretenderem verificar?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Recusar"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Ligar"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"AVISO: poderão ser cobradas taxas de dados adicionais pelo operador.\n\nA configuração do tablet poderá necessitar de uma atividade de rede considerável."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AVISO: poderão ser cobradas taxas de dados adicionais pelo operador.\n\nA configuração do telemóvel poderá necessitar de uma atividade de rede considerável."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"AVISO: se não tiver uma ligação à Internet, não será possível verificar se o software do tablet está atualizado."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"AVISO: se não tiver uma ligação à Internet, não será possível verificar se o software do telemóvel está atualizado."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"O tablet não conseguiu estabelecer ligação a esta rede Wi-Fi."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN do SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN incorreto"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Os PINs não correspondem"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Não é possível alterar o PIN."\n"PIN possivelmente incorreto."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Não é possível alterar o PIN.\nPIN possivelmente incorreto."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN do SIM mudado com sucesso"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Não é possível alterar o estado de bloqueio do cartão SIM. "\n"PIN possivelmente incorreto."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Não é possível alterar o estado de bloqueio do cartão SIM. \nPIN possivelmente incorreto."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Estado do tablet"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Reposição dos dados de fábrica"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Apaga todos os dados do tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Apaga todos os dados do telefone"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do tablet, incluindo:"\n\n<li>"A conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do telemóvel, incluindo:"\n\n<li>"A conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente, tem sessão iniciada nas seguintes contas:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do tablet, incluindo:\n\n"<li>"A conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do telemóvel, incluindo:\n\n"<li>"A conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente, tem sessão iniciada nas seguintes contas:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotografias"</li>\n<li>"Outros dados do utilizador"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para limpar músicas, imagens e outros dados do utilizador, é necessário apagar a "<b>"memória de armazenamento USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para limpar também músicas, imagens e outros dados do utilizador, é necessário apagar o "<b>"cartão SD"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar proc. em cache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Repor pref. de aplic."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Repor pref. de aplic.?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Esta ação irá repor todas as preferências para:"\n\n" "<li>"Aplicações desativadas"</li>\n" "<li>"Notificações de aplicações desativadas"</li>\n" "<li>"Aplicações predefinidas para ações"</li>\n" "<li>"Restrições de dados em segundo plano para aplicações"</li>\n\n" Não perderá quaisquer dados de aplicações."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Esta ação irá repor todas as preferências para:\n\n "<li>"Aplicações desativadas"</li>\n" "<li>"Notificações de aplicações desativadas"</li>\n" "<li>"Aplicações predefinidas para ações"</li>\n" "<li>"Restrições de dados em segundo plano para aplicações"</li>\n\n" Não perderá quaisquer dados de aplicações."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Repor aplicações"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gerir espaço"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrar"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para alternar, prima Ctrl-Bar. esp."</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predefinição"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Esquemas de teclado"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicionário do utilizador"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dicionário pessoal"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Dicionários pessoais"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Dicionário pessoal"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Adicionar"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Adicionar ao dicionário"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Incluir opção no menu avançado para criar um relatório de erros"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Manter ativo"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"O ecrã nunca entrará em suspensão durante o carregamento"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ativar registo de monitorização Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos os pacotes Bluetooth HCI num ficheiro"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Selecionar tempo exec."</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Selecionar tempo exec."</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Reiniciar para alterar o tempo de execução de <xliff:g id="OLD">%1$s</xliff:g> para <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Permitir depuração USB?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Proteger memória USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"As aplicações têm de pedir permissão para ler a memória USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Proteger memória USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Quando o armazenamento USB estiver protegido, as aplicações têm de pedir permissão para ler os dados do armazenamento externo."\n\n"Algumas aplicações podem não funcionar até serem atualizadas pelos respetivos programadores."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Quando o armazenamento USB estiver protegido, as aplicações têm de pedir permissão para ler os dados do armazenamento externo.\n\nAlgumas aplicações podem não funcionar até serem atualizadas pelos respetivos programadores."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Proteger cartão SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"As aplicações têm de pedir permissão para ler o cartão SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Proteger cartão SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Quando o cartão SD estiver protegido, as aplicações têm de pedir permissão para ler os dados do armazenamento externo."\n\n"Algumas aplicações podem não funcionar até serem atualizadas pelos respetivos programadores."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Quando o cartão SD estiver protegido, as aplicações têm de pedir permissão para ler os dados do armazenamento externo.\n\nAlgumas aplicações podem não funcionar até serem atualizadas pelos respetivos programadores."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal local"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Ativar aplicação terminal que oferece acesso local à shell"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Escolher miniaplicação"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Escolher widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Criar widget e permitir o acesso?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"serviços"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"SISTEMA"</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_screen_magnification_summary" msgid="2380627654189671754">"Quando esta funcionalidade está ativada, pode aumentar ou diminuir o zoom ao tocar três vezes no ecrã.\n\nEnquanto estiver a aumentar o zoom, pode:\n"<ul><li>"Deslocar: arraste dois ou mais dedos no ecrã."</li>\n<li>"Ajustar o nível de zoom: junte dois ou mais dedos ou afaste-os."</li></ul>\n\n"Também pode aumentar temporariamente o que estiver por baixo do seu dedo ao tocar três vezes sem soltar. Neste estado aumentado, pode arrastar o dedo para explorar diferentes partes do ecrã. Levante o dedo para voltar ao estado anterior.\n\nNota: O toque triplo para aumentar funciona em todo o lado, exceto no teclado e na barra de navegação."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Atalho de acessibilidade"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Ativado"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desligado"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Quando esta funcionalidade está ativada, pode rapidamente ativar funcionalidades de acessibilidade executando dois passos:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Quando esta funcionalidade está ativada, pode rapidamente ativar funcionalidades de acessibilidade executando dois passos:\n\nPasso 1: prima sem soltar o botão \"ligar/desligar\" até ouvir um som ou sentir uma vibração.\n\nPasso 2: toque sem soltar com dois dedos até ouvir uma confirmação.\n\nSe o dispositivo tiver vários utilizadores, a utilização deste atalho no ecrã de bloqueio ativa temporariamente a acessibilidade até que o dispositivo seja desbloqueado."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Texto grande"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ampliação do ecrã"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Atualiz. auto da ampliação do ecrã"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"O TalkBack fornece respostas faladas para ajudar os utilizadores invisuais e com deficiência visual. Pretende instalá-lo gratuitamente a partir do Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nenhuma descrição fornecida."</string>
     <string name="settings_button" msgid="3006713718908152930">"Definições"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Imprimir"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Definições de impressão"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Serviços"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utilizar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> pode receber documentos impressos. Tais documentos podem conter dados confidenciais."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Nenhum serviço instalado"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Definições"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Adicionar impressoras"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Ativado"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Desativado"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"O que tem estado a utilizar a bateria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Dados utiliz. bater. não disp."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi em execução"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefone"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Dados enviados"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Dados recebidos"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Dados móveis enviados"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Dados móveis recebidos"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Dados Wi-Fi enviados"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Dados Wi-Fi recebidos"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Áudio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Vídeo"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Hora activada"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonalidade"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afecta o tom do texto falado"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Idioma não selecionado"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Define a voz do idioma específico para o texto lido"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Ouvir um exemplo"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproduzir uma breve demonstração de síntese de voz"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP não suportado."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Não é possível configurar uma ligação Wi-Fi tipo EAP durante a configuração. Após a configuração, é possível fazê-lo em Definições &gt; Redes sem fios e outras."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"A ligação pode demorar alguns minutos..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toque em "<b>"Seguinte"</b>" para continuar a configuração."\n\n"Toque em "<b>"Anterior"</b>" para ligar a uma rede Wi‑Fi diferente."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toque em "<b>"Seguinte"</b>" para continuar a configuração.\n\nToque em "<b>"Anterior"</b>" para ligar a uma rede Wi‑Fi diferente."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronização ativada"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronização desativada"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Erro de sincronização"</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Calendário"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Contactos"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Bem-vindo ao Google Sync!"</font>" "\n"Uma abordagem da Google à sincronização de dados, que permite aceder aos contactos, compromissos e outros itens a partir de qualquer local onde se encontre."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Bem-vindo ao Google Sync!"</font>" \nUma abordagem da Google à sincronização de dados, que permite aceder aos contactos, compromissos e outros itens a partir de qualquer local onde se encontre."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Definições de sincronização da aplicação"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dados e sincronização"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Alterar palavra-passe"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Depurar sobreposição GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Desativ. sobreposições HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Utilizar sempre GPU para a composição do ecrã"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ativar vestígios OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Desativar dados em segundo plano em redes móveis. Serão utilizadas redes não móveis, se estiverem disponíveis."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Para restringir os dados de segundo plano para esta aplicação, comece por definir um limite de dados móveis."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Restringir dados em segundo plano?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Esta funcionalidade pode fazer com que uma aplicação que dependa de dados em segundo plano deixe de funcionar quando estiverem disponíveis apenas redes móveis."\n\n"Poderá encontrar controlos de utilização de dados mais adequados nas definições disponíveis dentro da aplicação."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Esta funcionalidade pode fazer com que uma aplicação que dependa de dados em segundo plano deixe de funcionar quando estiverem disponíveis apenas redes móveis.\n\nPoderá encontrar controlos de utilização de dados mais adequados nas definições disponíveis dentro da aplicação."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"A restrição de dados de segundo plano só é possível se tiver definido um limite de dados móveis."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Ativar sinc. auto. de dados?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Qualquer alteração que efetue nas contas a partir da Web será copiada automaticamente para o tablet."\n\n"Algumas contas também podem copiar automaticamente para a Web qualquer alteração que efetue no tablet. Uma Conta do Google funciona desta forma."\n\n"Para selecionar os tipos de informações a sincronizar em cada conta, aceda a Definições &gt; Contas."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Qualquer alteração que efetue nas contas a partir da Web será copiada automaticamente para o telemóvel."\n\n"Algumas contas também podem copiar automaticamente para a Web qualquer alteração que efetue no telemóvel. Uma Conta Google funciona desta forma."\n\n"Para selecionar os tipos de informações a sincronizar em cada conta, aceda a Definições &gt; Contas."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Qualquer alteração que efetue nas contas a partir da Web será copiada automaticamente para o tablet.\n\nAlgumas contas também podem copiar automaticamente para a Web qualquer alteração que efetue no tablet. Uma Conta do Google funciona desta forma.\n\nPara selecionar os tipos de informações a sincronizar em cada conta, aceda a Definições &gt; Contas."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Qualquer alteração que efetue nas contas a partir da Web será copiada automaticamente para o telemóvel.\n\nAlgumas contas também podem copiar automaticamente para a Web qualquer alteração que efetue no telemóvel. Uma Conta Google funciona desta forma.\n\nPara selecionar os tipos de informações a sincronizar em cada conta, aceda a Definições &gt; Contas."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Desativar sinc. auto. de dados?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Esta ação irá conservar a utilização de dados e bateria, mas é necessário sincronizar manualmente cada conta para recolher informações recentes. Não irá receber notificações quando ocorrerem atualizações."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de reposição de ciclo de utilização"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Definir aviso de utilização de dados"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Definir limite de utilização de dados"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitar utilização de dados"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"A ligação móvel de dados será desativada quando for atingido o limite especificado."\n\n"Uma vez que a utilização dos dados é medida pelo tablet e o seu operador pode calcular a utilização de forma diferente, considere utilizar um limite de precaução"</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"A ligação móvel de dados será desativada quando for atingido o limite especificado."\n\n"Uma vez que a utilização dos dados é medida pelo telemóvel e o seu operador pode calcular a utilização de forma diferente, considere utilizar um limite de precaução."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"A ligação móvel de dados será desativada quando for atingido o limite especificado.\n\nUma vez que a utilização dos dados é medida pelo tablet e o seu operador pode calcular a utilização de forma diferente, considere utilizar um limite de precaução"</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"A ligação móvel de dados será desativada quando for atingido o limite especificado.\n\nUma vez que a utilização dos dados é medida pelo telemóvel e o seu operador pode calcular a utilização de forma diferente, considere utilizar um limite de precaução."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Restringir dados em segundo plano?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Se restringir os dados móveis de segundo plano, algumas aplicações e serviços não funcionarão exceto se estiver ligado a uma rede Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Se restringir os dados móveis em segundo plano, algumas aplicações e serviços não funcionarão exceto se estiver ligado a uma rede Wi-Fi."\n\n"Esta definição afeta todos os utilizadores deste tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Se restringir os dados móveis em segundo plano, algumas aplicações e serviços não funcionarão exceto se estiver ligado a uma rede Wi-Fi."\n\n"Esta definição afeta todos os utilizadores deste telemóvel."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Se restringir os dados móveis em segundo plano, algumas aplicações e serviços não funcionarão exceto se estiver ligado a uma rede Wi-Fi.\n\nEsta definição afeta todos os utilizadores deste tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Se restringir os dados móveis em segundo plano, algumas aplicações e serviços não funcionarão exceto se estiver ligado a uma rede Wi-Fi.\n\nEsta definição afeta todos os utilizadores deste telemóvel."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"aviso"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limite"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicações removidas"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Utilizador"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restrito"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Adicionar novo utilizador"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Pode partilhar este dispositivo com outras pessoas criando utilizadores adicionais. Cada utilizador tem o seu próprio espaço, que pode personalizar com as suas próprias aplicações, imagem de fundo e etc. Os utilizadores podem também ajustar as definições do tablet, como o Wi-Fi que afeta toda a gente."\n\n"Depois de criar um novo utilizador, essa pessoa necessita de passar por um processo de configuração."\n\n"Qualquer utilizador pode aceitar as permissões de aplicações atualizadas em nome de todos os outros utilizadores."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"Depois de criar um novo utilizador, essa pessoa necessita de passar por um processo de configuração."\n\n"Qualquer utilizador pode aceitar as permissões de aplicações atualizadas em nome de todos os outros utilizadores."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Pode partilhar este dispositivo com outras pessoas criando utilizadores adicionais. Cada utilizador tem o seu próprio espaço, que pode personalizar com as suas próprias aplicações, imagem de fundo e etc. Os utilizadores podem também ajustar as definições do tablet, como o Wi-Fi que afeta toda a gente.\n\nDepois de criar um novo utilizador, essa pessoa necessita de passar por um processo de configuração.\n\nQualquer utilizador pode aceitar as permissões de aplicações atualizadas em nome de todos os outros utilizadores."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Depois de criar um novo utilizador, essa pessoa necessita de passar por um processo de configuração.\n\nQualquer utilizador pode aceitar as permissões de aplicações atualizadas em nome de todos os outros utilizadores."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurar o utilizador agora?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Certifique-se de que a pessoa está disponível para pegar no tablet e configurar o respetivo espaço"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Configurar perfil agora?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta definição afeta todos os utilizadores deste telemóvel."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Alterar idioma"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Alterar tamanho da letra"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Restrições"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Remover restrições"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Alterar PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificações"</string>
     <string name="help_label" msgid="1107174367904110532">"Ajuda"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Conta para conteúdo"</string>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 684b86b73dd..0a29fd81019 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Local"</item>
     <item msgid="255608127647030286">"Pessoal"</item>
     <item msgid="4588829735729884491">"Mensagens"</item>
-    <item msgid="8971765125227378270">"Dispositivo"</item>
+    <item msgid="886742181977884584">"Mídia"</item>
+    <item msgid="7924928667052300589">"Dispositivo"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"localização aproximada"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"reproduzir áudio"</item>
     <item msgid="8374996688066472414">"ler a área de transferência"</item>
     <item msgid="3045529469061083747">"modificar a área de transferência"</item>
+    <item msgid="5124443975763747838">"botões de mídia"</item>
+    <item msgid="4547883971364273343">"foco de áudio"</item>
+    <item msgid="2603878814882344450">"volume mestre"</item>
+    <item msgid="7136963238377062018">"volume da voz"</item>
+    <item msgid="4270236897655923007">"volume do toque"</item>
+    <item msgid="6325739889222559394">"volume da mídia"</item>
+    <item msgid="5762123934816216821">"volume do alarme"</item>
+    <item msgid="785049718065337473">"volume da notificação"</item>
+    <item msgid="6700305533746877052">"volume do Bluetooth"</item>
+    <item msgid="2029227495214047094">"permanecer ativo"</item>
+    <item msgid="26109888160231211">"monitorar local"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Local"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Reproduzir áudio"</item>
     <item msgid="136815868796597058">"Ler a área de transferência"</item>
     <item msgid="5238692940326972503">"Modificar a área de transferência"</item>
+    <item msgid="5753789168376302997">"Botões de mídia"</item>
+    <item msgid="3265262911688671938">"Foco de áudio"</item>
+    <item msgid="2098976479485046797">"Volume mestre"</item>
+    <item msgid="5660213838861789350">"Volume da voz"</item>
+    <item msgid="7983336752371254444">"Volume do toque"</item>
+    <item msgid="7878027809189330917">"Volume da mídia"</item>
+    <item msgid="7260546305036218513">"Volume do alarme"</item>
+    <item msgid="9103719301075748925">"Volume da notificação"</item>
+    <item msgid="7025966722295861512">"Volume do Bluetooth"</item>
+    <item msgid="4665183401128289653">"Permanecer ativo"</item>
+    <item msgid="8584357129746649222">"Local"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curto"</item>
     <item msgid="2560532955514699713">"Médio"</item>
     <item msgid="2372711992605524591">"Longo"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (depuração)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Usar Dalvik"</item>
+    <item msgid="5131846588686178907">"Usar ART"</item>
+    <item msgid="4530003713865319928">"Usar compilação de depuração do ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nunca verificar"</item>
     <item msgid="6042769699089883931">"Verificar somente conteúdo DRM"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Na tela em linhas"</item>
     <item msgid="120512413928262547">"Em adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Desativado"</item>
+    <item msgid="7688197031296835369">"Mostrar áreas de overdraw"</item>
+    <item msgid="8332661909019981149">"Mostrar contador de overdraw"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite padrão"</item>
     <item msgid="4071574792028999443">"Sem processos em segundo plano"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 895ab3bddcf..96a52646bdb 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Ao permitir o roaming de dados, você poderá receber cobranças significativas de roaming.\n\nEsta configuração afeta todos os usuários do tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Ao permitir o roaming de dados, você poderá receber cobranças significativas de roaming.\n\nEsta configuração afeta todos os usuários do telefone."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Permitir roaming de dados?"</string>
     <string name="networks" msgid="6333316876545927039">"Seleção de operador"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Selecione um operador de rede"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Exigir um PIN numérico ou uma senha para decodificar seu tablet sempre que ligá-lo"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Exigir um PIN numérico ou senha para decodificar seu telefone sempre que ligá-lo"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Criptografado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Você pode criptografar suas contas, configurações, aplicativos transferidos e seus dados, mídia e outros arquivos. Após criptografar seu tablet, será necessário digitar um PIN numérico ou senha para descriptografar toda vez que você ligá-lo. Não é possível desfazer a criptografia em seu tablet, exceto se realizar uma redefinição para configuração original, apagando todos os seus dados."\n\n"A criptografia leva um hora ou mais. Você deve iniciar com a bateria carregada e manter seu tablet conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Você pode criptografar suas contas, configurações, aplicativos transferidos e seus dados, mídia e outros arquivos. Após criptografar seu telefone, será necessário digitar um PIN numérico ou senha para descriptografar toda vez que você ligá-lo. Não é possível desfazer a criptografia em seu telefone, exceto se realizar uma redefinição para configuração original, apagando todos os seus dados."\n\n"A criptografia leva um hora ou mais. Você deve iniciar com a bateria carregada e manter seu telefone conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Você pode criptografar suas contas, configurações, aplicativos transferidos e seus dados, mídia e outros arquivos. Após criptografar seu tablet, será necessário digitar um PIN numérico ou senha para descriptografar toda vez que você ligá-lo. Não é possível desfazer a criptografia em seu tablet, exceto se realizar uma redefinição para configuração original, apagando todos os seus dados.\n\nA criptografia leva um hora ou mais. Você deve iniciar com a bateria carregada e manter seu tablet conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Você pode criptografar suas contas, configurações, aplicativos transferidos e seus dados, mídia e outros arquivos. Após criptografar seu telefone, será necessário digitar um PIN numérico ou senha para descriptografar toda vez que você ligá-lo. Não é possível desfazer a criptografia em seu telefone, exceto se realizar uma redefinição para configuração original, apagando todos os seus dados.\n\nA criptografia leva um hora ou mais. Você deve iniciar com a bateria carregada e manter seu telefone conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Criptografar tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Criptografar telefone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carregue sua bateria e tente novamente."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Tente novamente em <xliff:g id="DELAY">^1</xliff:g> segundos."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Digite sua senha"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Falha na criptografia"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"A criptografia foi interrompida e não pode ser concluída. Por esse motivo, os dados em seu tablet não podem ser acessados. "\n\n" Para continuar usando seu tablet, é necessário restaurar as configurações originais. Quando você configurar seu tablet após a restauração, poderá recuperar todos os dados que foram salvos em backup em sua Conta do Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"A criptografia foi interrompida e não pode ser concluída. Por esse motivo, os dados em seu telefone não podem mais ser acessados. "\n\n"Para continuar usando seu telefone, é necessário restaurar as configurações originais. Quando você configurar seu telefone após a restauração, poderá recuperar todos os dados que foram salvos em backup em sua Conta do Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"A criptografia foi interrompida e não pode ser concluída. Por esse motivo, os dados em seu tablet não podem ser acessados. \n\n Para continuar usando seu tablet, é necessário restaurar as configurações originais. Quando você configurar seu tablet após a restauração, poderá recuperar todos os dados que foram salvos em backup em sua Conta do Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"A criptografia foi interrompida e não pode ser concluída. Por esse motivo, os dados em seu telefone não podem mais ser acessados. \n\nPara continuar usando seu telefone, é necessário restaurar as configurações originais. Quando você configurar seu telefone após a restauração, poderá recuperar todos os dados que foram salvos em backup em sua Conta do Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Alterar o método de entrada"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Escolher bloq. de tela"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Selec. o bloq. de backup"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Conectando"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Conectado"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponível"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Em uso"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Configurações do display"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Desconectar?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Isso encerrará sua conexão com:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desativado"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponível porque o NFC está desativado"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Quando este recurso está ativado, você pode enviar o conteúdo do aplicativo para outro dispositivo compatível com NFC, mantendo os dispositivos próximos. Por exemplo, você pode enviar páginas do navegador, vídeos do YouTube, contatos de pessoas e muito mais."\n\n"Basta posicionar os dispositivos próximos (normalmente de costas um para o outro) e tocar em sua tela. O aplicativo determina o que é enviado."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Quando este recurso está ativado, você pode enviar o conteúdo do aplicativo para outro dispositivo compatível com NFC, mantendo os dispositivos próximos. Por exemplo, você pode enviar páginas do navegador, vídeos do YouTube, contatos de pessoas e muito mais.\n\nBasta posicionar os dispositivos próximos (normalmente de costas um para o outro) e tocar em sua tela. O aplicativo determina o que é enviado."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Detecção de serviço de rede"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permitir que aplicativos em outros dispositivos descubram aplicativos neste dispositivo"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Nenhuma"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para aumentar a precisão da localização e outras finalidades, <xliff:g id="APP_NAME">%1$s</xliff:g> quer ativar a verificação de rede, mesmo que o Wi-Fi esteja desligado."\n\n"Permitir isto para todos os aplicativos que quiserem verificar?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para aumentar a precisão da localização e outras finalidades, <xliff:g id="APP_NAME">%1$s</xliff:g> quer ativar a verificação de rede, mesmo que o Wi-Fi esteja desligado.\n\nPermitir isto para todos os aplicativos que quiserem verificar?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Negar"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"AVISO: você poderá receber cobranças significativas de dados da operadora.\n\nA configuração do tablet pode exigir atividade de rede significativa."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AVISO: você poderá receber cobranças significativas de dados da operadora.\n\nA configuração do telefone pode exigir atividade de rede significativa."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"AVISO: o tablet não poderá verificar a atualização do software até conectar-se à Internet."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"AVISO: o telefone não poderá verificar a atualização do software até conectar-se à Internet."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"O tablet não foi capaz de conectar à rede Wi-Fi."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN do SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN incorreto"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Os PINs não correspondem"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Não é possível alterar o PIN."\n"PIN possivelmente incorreto."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Não é possível alterar o PIN.\nPIN possivelmente incorreto."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN do SIM alterado"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Não é possível alterar o estado de bloqueio do cartão SIM."\n"PIN possivelmente incorreto."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Não é possível alterar o estado de bloqueio do cartão SIM.\nPIN possivelmente incorreto."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status do tablet"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Configuração original"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Apaga todos os dados no tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Apaga todos os dados no telefone"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:"\n\n<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos aplicativos"</li>\n<li>"Aplicativos transferidos"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" de seu telefone, incluindo:"\n\n<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos aplicativos"</li>\n<li>"Aplicativos baixados"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"No momento você está conectado às seguintes contas:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos aplicativos"</li>\n<li>"Aplicativos transferidos"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Essa ação apagará todos os dados do "<b>"armazenamento interno"</b>" de seu telefone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos aplicativos"</li>\n<li>"Aplicativos baixados"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"No momento você está conectado às seguintes contas:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para limpar músicas, fotos e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para limpar músicas, imagens e outros dados de usuário, o conteúdo do "<b>"cartão SD"</b>" precisa ser apagado."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar processo em cache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Redefinir preferências"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Redefinir preferências?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Isso redefinirá todas as preferências para:"\n\n" "<li>"aplicativos desativados"</li>\n" "<li>"notificações de aplicativos desativados"</li>\n" "<li>"aplicativos padrão para ações"</li>\n" "<li>"restrições de dados em segundo plano para aplicativos"</li>\n\n" Os dados dos aplicativos não serão perdidos."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Isso redefinirá todas as preferências para:\n\n "<li>"aplicativos desativados"</li>\n" "<li>"notificações de aplicativos desativados"</li>\n" "<li>"aplicativos padrão para ações"</li>\n" "<li>"restrições de dados em segundo plano para aplicativos"</li>\n\n" Os dados dos aplicativos não serão perdidos."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Redefinir aplicativos"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gerenciar espaço"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para alterar, pressione Ctrl+espaço"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Padrão"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Layouts de teclado"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicionário do usuário"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dicionário pessoal"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Dicionários pessoais"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Dicionário pessoal"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Adicionar"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Adicionar ao dicionário"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Incluir a opção de obter um relatório de bugs no menu do botão de ligar"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Permanecer ativo"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"A tela nunca entrará em inatividade enquanto estiver carregando."</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ativar registro de rastreamento Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos os pacotes Bluetooth HCI em um arquivo"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Selecionar tempo de execução"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Selecionar tempo de execução"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Reiniciar para mudar tempo de execução de <xliff:g id="OLD">%1$s</xliff:g> para <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Permitir a depuração USB?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Proteger o armazenamento USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplicativos precisam de permissão para ler o armazenamento USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Proteger o armazenamento USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Quando o armazenamento USB está protegido, os aplicativos devem solicitar permissão para ler dados de armazenamento externo."\n\n"Alguns aplicativos podem não funcionar até que sejam atualizados por seus desenvolvedores."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Quando o armazenamento USB está protegido, os aplicativos devem solicitar permissão para ler dados de armazenamento externo.\n\nAlguns aplicativos podem não funcionar até que sejam atualizados por seus desenvolvedores."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Proteger o cartão SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplicativos precisam de permissão para ler o cartão SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Proteger o cartão SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Quando o cartão SD está protegido, os aplicativos devem solicitar permissão para ler dados de armazenamento externo."\n\n"Alguns aplicativos podem não funcionar até que sejam atualizados por seus desenvolvedores."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Quando o cartão SD está protegido, os aplicativos devem solicitar permissão para ler dados de armazenamento externo.\n\nAlguns aplicativos podem não funcionar até que sejam atualizados por seus desenvolvedores."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Terminal local"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Ativar o aplicativo terminal que oferece acesso ao shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Escolher o gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Escolher widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Criar widget e permitir acesso?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Serviços"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</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_screen_magnification_summary" msgid="2380627654189671754">"Quando este recurso está ativado, você pode aumentar e diminuir o zoom com um toque triplo na tela.\n\nQuando o zoom é aplicado, você pode:\n"<ul><li>"Deslocar: arraste dois ou mais dedos pela tela."</li>\n<li>"Ajustar o nível de zoom: use o gesto de pinçagem ou expanda usando dois ou mais dedos."</li></ul>\n\n"Você também pode ampliar temporariamente o que estiver sob seu dedo dando um toque triplo e segurando. No estado ampliado, arraste o dedo para explorar as diferentes partes da tela. Levante o dedo para voltar ao estado anterior.\n\nObservação: o toque triplo para ampliar funciona em qualquer parte da tela, exceto no teclado e na barra de navegação."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Atalho de acessibilidade"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Ligado"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Desativado"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Quando este recurso está ativado, você pode ativar rapidamente os recursos de acessibilidade em duas etapas:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Quando este recurso está ativado, você pode ativar rapidamente os recursos de acessibilidade em duas etapas:\n\nEtapa 1: pressione e segure o botão liga/desliga até ouvir um som ou sentir uma vibração.\n\nEtapa 2: toque e segure com dois dedos até ouvir a confirmação de áudio.\n\nCaso o dispositivo tenha vários usuários, este atalho na tela de bloqueio pode ativar temporariamente a acessibilidade até que o dispositivo seja desbloqueado."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Texto grande"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ampliação da tela"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Atual. autom. da ampliação da tela"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"O TalkBack fornece feedback por voz para ajudar usuários cegos ou com visão reduzida. Deseja instalá-lo gratuitamente do Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nenhuma descrição foi fornecida."</string>
     <string name="settings_button" msgid="3006713718908152930">"Configurações"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Impressão"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Config. de impressão"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Serviços"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> pode receber os documentos que você imprimir. Esses documentos podem conter dados confidenciais."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Nenhum serviço instalado"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Configurações"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Adicionar impressoras"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Ativado"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Desativado"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"O que está consumindo a bateria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Dados de uso da bat. indisp."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi em execução"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefone"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Dados enviados"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Dados recebidos"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Dados móveis enviados"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Dados móveis recebidos"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Dados Wi-Fi enviados"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Dados Wi-Fi recebidos"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Áudio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Vídeo"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tempo ligado"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Frequência do som"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afeta o tom do texto falado"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Idioma não selecionado"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Define a voz específica do idioma para o texto falado"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Ouça um exemplo"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Reproduzir uma rápida demonstração da voz sintetizada"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP não é suportado."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Não é possível configurar uma conexão Wi-Fi EAP durante a configuração. É possível fazer isso em seguida, na opção \"Configurações\" &gt; \"Sem fio e redes\"."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"A conexão pode levar alguns minutos..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toque em "<b>"Próximo"</b>" para continuar a configuração."\n\n"Toque em "<b>"Voltar"</b>" para conectar-se a outra rede Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toque em "<b>"Próximo"</b>" para continuar a configuração.\n\nToque em "<b>"Voltar"</b>" para conectar-se a outra rede Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronização ativada"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronização desativada"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Erro de sincronização."</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Agenda"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Contatos"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Bem-vindo ao Google Sync!"</font>" "\n"Um método do Google para sincronizar dados a fim de permitir acesso aos seus contatos, compromissos e muito mais, onde quer que você esteja."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Bem-vindo ao Google Sync!"</font>" \nUm método do Google para sincronizar dados a fim de permitir acesso aos seus contatos, compromissos e muito mais, onde quer que você esteja."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Configurações de sincronização do aplicativo"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Dados e sincronização"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Alterar senha"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Depurar overdraw da GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Desativar sobreposição HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Sempre usar a GPU para composição de tela"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ativar rastream. OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <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 2º plano"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Restringir dados de segundo plano?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Este recurso pode fazer com que um aplicativo que depende de dados de segundo plano pare de funcionar quando somente redes de acesso limitado estiverem disponíveis."\n\n"Você pode encontrar controles de uso de dados mais apropriados nas configurações disponíveis no aplicativo."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Este recurso pode fazer com que um aplicativo que depende de dados de segundo plano pare de funcionar quando somente redes de acesso limitado estiverem disponíveis.\n\nVocê pode encontrar controles de uso de dados mais apropriados nas configurações disponíveis no aplicativo."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Restringir dados de segundo plano só é possível quando você define um limite de dados móveis."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Ativar sincronização automática?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"As alterações feitas em suas contas na web serão automaticamente copiadas para o tablet."\n\n"Algumas contas, como Contas do Google, também poderão copiar automaticamente as alterações feitas no tablet para a web."\n" "\n"Para determinar as informações a sincronizar em cada conta, acesse Configurações &gt; Contas."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"As alterações feitas em suas contas na web serão automaticamente copiadas para o telefone."\n\n"Algumas contas, como Contas do Google, também poderão copiar automaticamente as alterações feitas no telefone para a web."\n" "\n"Para determinar as informações a sincronizar em cada conta, acesse Configurações &gt; Contas."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"As alterações feitas em suas contas na web serão automaticamente copiadas para o tablet.\n\nAlgumas contas, como Contas do Google, também poderão copiar automaticamente as alterações feitas no tablet para a web.\n \nPara determinar as informações a sincronizar em cada conta, acesse Configurações &gt; Contas."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"As alterações feitas em suas contas na web serão automaticamente copiadas para o telefone.\n\nAlgumas contas, como Contas do Google, também poderão copiar automaticamente as alterações feitas no telefone para a web.\n \nPara determinar as informações a sincronizar em cada conta, acesse Configurações &gt; Contas."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Desativar sincroniz. automática?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Isto preservará o uso de dados e da bateria, mas será necessário sincronizar manualmente cada conta para obter as informações mais recentes, e você não será informado de novas atualizações."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de redefinição do ciclo de uso"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Definir aviso de uso de dados"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Definir limite do uso de dados"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitando uso de dados"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Sua conexão de dados móveis será desativada quando o limite especificado for atingido."\n\n"Como o uso de dados é calculado por seu tablet, e sua operadora pode entender o uso de forma diferente, use um limite moderado."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Sua conexão de dados móveis será desativada quando o limite especificado for atingido."\n\n"Como o uso de dados é calculado por seu telefone, e sua operadora pode entender o uso de forma diferente, use um limite moderado."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Sua conexão de dados móveis será desativada quando o limite especificado for atingido.\n\nComo o uso de dados é calculado por seu tablet, e sua operadora pode entender o uso de forma diferente, use um limite moderado."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Sua conexão de dados móveis será desativada quando o limite especificado for atingido.\n\nComo o uso de dados é calculado por seu telefone, e sua operadora pode entender o uso de forma diferente, use um limite moderado."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Restringir dados de segundo plano?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Ao restringir os dados móveis em segundo plano, alguns aplicativos e serviços só funcionarão se você estiver conectado a uma rede Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ao restringir os dados móveis em segundo plano, alguns aplicativos e serviços só funcionarão se você estiver conectado a uma rede Wi-Fi."\n\n"Esta configuração afeta todos os usuários do tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ao restringir os dados móveis em segundo plano, alguns aplicativos e serviços só funcionarão se você estiver conectado a uma rede Wi-Fi."\n\n"Esta configuração afeta todos os usuários do telefone."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ao restringir os dados móveis em segundo plano, alguns aplicativos e serviços só funcionarão se você estiver conectado a uma rede Wi-Fi.\n\nEsta configuração afeta todos os usuários do tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ao restringir os dados móveis em segundo plano, alguns aplicativos e serviços só funcionarão se você estiver conectado a uma rede Wi-Fi.\n\nEsta configuração afeta todos os usuários do telefone."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"aviso"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limite"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicativos removidos"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuário"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restrito"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Adicionar novo usuário"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Compartilhe este dispositivo com outras pessoas criando usuários adicionais. Cada usuário terá seu próprio espaço, que poderá personalizar com seus próprios aplicativos, plano de fundo, etc. Os usuários também poderão ajustar configurações do tablet que afetam a todos, como o Wi-Fi."\n\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_add_user_message_long" msgid="3086244205384741788">"Compartilhe este dispositivo com outras pessoas criando usuários adicionais. Cada usuário terá seu próprio espaço, que poderá personalizar com seus próprios aplicativos, plano de fundo, etc. Os usuários também poderão ajustar configurações do tablet que afetam a todos, como o Wi-Fi.\n\nDepois que você cria um novo usuário, essa pessoa deve concluir o processo de configuração.\n\nQualquer usuário poderá aceitar permissões atualizadas de aplicativos em nome de todos os demais."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Depois que você cria um novo usuário, essa pessoa deve concluir o processo de configuração.\n\nQualquer usuário poderá aceitar permissões atualizadas de aplicativos em nome de todos os demais."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurar o usuário agora?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Certifique-se de que a pessoa está disponível para assumir o tablet e configurar seu espaço"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Configurar perfil agora?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuração afeta todos os usuários do telefone."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Alterar idioma"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Alterar tamanho da fonte"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Restrições"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Remover restrições"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Alterar PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificações"</string>
     <string name="help_label" msgid="1107174367904110532">"Ajuda"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Conta para conteúdo"</string>
diff --git a/res/values-rm/arrays.xml b/res/values-rm/arrays.xml
index 436d800cf48..0b0b1c7b10c 100644
--- a/res/values-rm/arrays.xml
+++ b/res/values-rm/arrays.xml
@@ -158,7 +158,8 @@
     <!-- no translation found for app_ops_categories:0 (6358963769537892925) -->
     <!-- no translation found for app_ops_categories:1 (255608127647030286) -->
     <!-- no translation found for app_ops_categories:2 (4588829735729884491) -->
-    <!-- no translation found for app_ops_categories:3 (8971765125227378270) -->
+    <!-- no translation found for app_ops_categories:3 (886742181977884584) -->
+    <!-- no translation found for app_ops_categories:4 (7924928667052300589) -->
     <!-- no translation found for app_ops_summaries:0 (4979188868761515915) -->
     <!-- no translation found for app_ops_summaries:1 (5789673140227507995) -->
     <!-- no translation found for app_ops_summaries:2 (1061584358377390581) -->
@@ -190,6 +191,17 @@
     <!-- no translation found for app_ops_summaries:28 (5031552983987798163) -->
     <!-- no translation found for app_ops_summaries:29 (8374996688066472414) -->
     <!-- no translation found for app_ops_summaries:30 (3045529469061083747) -->
+    <!-- no translation found for app_ops_summaries:31 (5124443975763747838) -->
+    <!-- no translation found for app_ops_summaries:32 (4547883971364273343) -->
+    <!-- no translation found for app_ops_summaries:33 (2603878814882344450) -->
+    <!-- no translation found for app_ops_summaries:34 (7136963238377062018) -->
+    <!-- no translation found for app_ops_summaries:35 (4270236897655923007) -->
+    <!-- no translation found for app_ops_summaries:36 (6325739889222559394) -->
+    <!-- no translation found for app_ops_summaries:37 (5762123934816216821) -->
+    <!-- no translation found for app_ops_summaries:38 (785049718065337473) -->
+    <!-- no translation found for app_ops_summaries:39 (6700305533746877052) -->
+    <!-- no translation found for app_ops_summaries:40 (2029227495214047094) -->
+    <!-- no translation found for app_ops_summaries:41 (26109888160231211) -->
     <!-- no translation found for app_ops_labels:0 (6602854600289714121) -->
     <!-- no translation found for app_ops_labels:1 (8677040780775113033) -->
     <!-- no translation found for app_ops_labels:2 (1660743989948992916) -->
@@ -221,9 +233,26 @@
     <!-- no translation found for app_ops_labels:28 (3493046322001257041) -->
     <!-- no translation found for app_ops_labels:29 (136815868796597058) -->
     <!-- no translation found for app_ops_labels:30 (5238692940326972503) -->
+    <!-- no translation found for app_ops_labels:31 (5753789168376302997) -->
+    <!-- no translation found for app_ops_labels:32 (3265262911688671938) -->
+    <!-- no translation found for app_ops_labels:33 (2098976479485046797) -->
+    <!-- no translation found for app_ops_labels:34 (5660213838861789350) -->
+    <!-- no translation found for app_ops_labels:35 (7983336752371254444) -->
+    <!-- no translation found for app_ops_labels:36 (7878027809189330917) -->
+    <!-- no translation found for app_ops_labels:37 (7260546305036218513) -->
+    <!-- no translation found for app_ops_labels:38 (9103719301075748925) -->
+    <!-- no translation found for app_ops_labels:39 (7025966722295861512) -->
+    <!-- no translation found for app_ops_labels:40 (4665183401128289653) -->
+    <!-- no translation found for app_ops_labels:41 (8584357129746649222) -->
     <!-- no translation found for long_press_timeout_selector_titles:0 (3511504869290423954) -->
     <!-- no translation found for long_press_timeout_selector_titles:1 (2560532955514699713) -->
     <!-- no translation found for long_press_timeout_selector_titles:2 (2372711992605524591) -->
+    <!-- no translation found for select_runtime_titles:0 (3574453009229338122) -->
+    <!-- no translation found for select_runtime_titles:1 (8978402910750533864) -->
+    <!-- no translation found for select_runtime_titles:2 (7839859333977894115) -->
+    <!-- no translation found for select_runtime_summaries:0 (6412880178297884701) -->
+    <!-- no translation found for select_runtime_summaries:1 (5131846588686178907) -->
+    <!-- no translation found for select_runtime_summaries:2 (4530003713865319928) -->
     <!-- no translation found for hdcp_checking_titles:0 (441827799230089869) -->
     <!-- no translation found for hdcp_checking_titles:1 (6042769699089883931) -->
     <!-- no translation found for hdcp_checking_titles:2 (9174900380056846820) -->
@@ -267,6 +296,9 @@
     <!-- no translation found for track_frame_time_entries:1 (2751513398307949636) -->
     <!-- no translation found for track_frame_time_entries:2 (8272260411216018353) -->
     <!-- no translation found for track_frame_time_entries:3 (120512413928262547) -->
+    <!-- no translation found for debug_hw_overdraw_entries:0 (8190572633763871652) -->
+    <!-- no translation found for debug_hw_overdraw_entries:1 (7688197031296835369) -->
+    <!-- no translation found for debug_hw_overdraw_entries:2 (8332661909019981149) -->
     <!-- no translation found for app_process_limit_entries:0 (3401625457385943795) -->
     <!-- no translation found for app_process_limit_entries:1 (4071574792028999443) -->
     <!-- no translation found for app_process_limit_entries:2 (4810006996171705398) -->
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index e35500b1860..f5d3bc1da9e 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -749,6 +749,8 @@
     <skip />
     <!-- no translation found for wifi_display_status_available (1924167525172207067) -->
     <skip />
+    <!-- no translation found for wifi_display_status_in_use (8556830875615434792) -->
+    <skip />
     <!-- no translation found for wifi_display_details (7791118209992162698) -->
     <skip />
     <!-- no translation found for wifi_display_disconnect_title (1543715924639003599) -->
@@ -1906,10 +1908,7 @@
     <skip />
     <!-- no translation found for keyboard_layout_picker_title (556081931972771610) -->
     <skip />
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicziunari da l\'utilisader"</string>
-    <!-- no translation found for user_dict_single_settings_title (524997218433540614) -->
-    <skip />
-    <!-- no translation found for user_dict_multiple_settings_title (3735224433307996276) -->
+    <!-- no translation found for user_dict_settings_title (3427169369758733521) -->
     <skip />
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Agiuntar"</string>
@@ -2006,6 +2005,16 @@
     <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Restar activ"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Il visur na dorma mai cun chargiar"</string>
+    <!-- no translation found for bt_hci_snoop_log (3340699311158865670) -->
+    <skip />
+    <!-- no translation found for bt_hci_snoop_log_summary (730247028210113851) -->
+    <skip />
+    <!-- no translation found for select_runtime_title (649783802363155346) -->
+    <skip />
+    <!-- no translation found for select_runtime_dialog_title (5314872813037493958) -->
+    <skip />
+    <!-- no translation found for select_runtime_warning_message (1937574953265648165) -->
+    <skip />
     <string name="allow_mock_location" msgid="2787962564578664888">"Posiziuns faussas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permetter posiziuns faussas"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Permetter da debugar USB?"</string>
@@ -2037,6 +2046,10 @@
     <skip />
     <!-- no translation found for enforce_read_external_confirm_message (3858482712337574407) -->
     <skip />
+    <!-- no translation found for enable_terminal_title (95572094356054120) -->
+    <skip />
+    <!-- no translation found for enable_terminal_summary (67667852659359206) -->
+    <skip />
     <string name="gadget_picker_title" msgid="98374951396755811">"Tscherner in gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Tscherner in widget"</string>
     <!-- no translation found for allow_bind_app_widget_activity_allow_bind_title (2538303018392590627) -->
@@ -2116,6 +2129,26 @@
     <skip />
     <!-- no translation found for settings_button (3006713718908152930) -->
     <skip />
+    <!-- no translation found for print_settings (4742428530112487843) -->
+    <skip />
+    <!-- no translation found for print_settings_title (4911263339115736689) -->
+    <skip />
+    <!-- no translation found for print_services_title (1088097751249445946) -->
+    <skip />
+    <!-- no translation found for print_service_security_warning_title (2338435517408144841) -->
+    <skip />
+    <!-- no translation found for print_service_security_warning_summary (919299459931111450) -->
+    <skip />
+    <!-- no translation found for print_no_services_installed (8443039625463872294) -->
+    <skip />
+    <!-- no translation found for print_menu_item_settings (6591330373682227082) -->
+    <skip />
+    <!-- no translation found for print_menu_item_add_printers (2890738028215834012) -->
+    <skip />
+    <!-- no translation found for print_feature_state_on (8098901852502441048) -->
+    <skip />
+    <!-- no translation found for print_feature_state_off (7294876968403966040) -->
+    <skip />
     <!-- no translation found for power_usage_summary_title (7190304207330319919) -->
     <skip />
     <string name="power_usage_summary" msgid="7237084831082848168">"Consumaders da l\'accu"</string>
@@ -2169,8 +2202,14 @@
     <!-- no translation found for usage_type_phone (262638572890253393) -->
     <skip />
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Datas tramessas"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Datas recepidas"</string>
+    <!-- no translation found for usage_type_data_send (3875198715268918671) -->
+    <skip />
+    <!-- no translation found for usage_type_data_recv (6694951443404021754) -->
+    <skip />
+    <!-- no translation found for usage_type_data_wifi_send (7178327382353096029) -->
+    <skip />
+    <!-- no translation found for usage_type_data_wifi_recv (7822328607564241372) -->
+    <skip />
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Temp activ"</string>
@@ -2244,6 +2283,8 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Autezza dal tun"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Influenzescha il tun dal text discurrì"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Lingua"</string>
+    <!-- no translation found for tts_lang_not_selected (7395787019276734765) -->
+    <skip />
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Definescha la vusch specifica da mintga lingua per il text pledà"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Tadlar in exempel"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Far ina curta demonstraziun da la sintesa vocala"</string>
@@ -2631,9 +2672,7 @@
     <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) -->
+    <!-- no translation found for debug_hw_overdraw (2968692419951565417) -->
     <skip />
     <!-- no translation found for disable_overlays (2074488440505934665) -->
     <skip />
@@ -3028,6 +3067,12 @@
     <skip />
     <!-- no translation found for global_font_change_title (1887126466191012035) -->
     <skip />
+    <!-- no translation found for restriction_settings_title (4233515503765879736) -->
+    <skip />
+    <!-- no translation found for restriction_menu_reset (2067644523489568173) -->
+    <skip />
+    <!-- no translation found for restriction_menu_change_pin (740081584044302775) -->
+    <skip />
     <!-- no translation found for app_notifications_switch_label (9124072219553687583) -->
     <skip />
     <!-- no translation found for help_label (1107174367904110532) -->
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 3d909a85f54..74f8f83443e 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Locație"</item>
     <item msgid="255608127647030286">"Personal"</item>
     <item msgid="4588829735729884491">"Mesagerie"</item>
-    <item msgid="8971765125227378270">"Gadget"</item>
+    <item msgid="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Dispozitiv"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"locație imprecisă"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"redă conținut audio"</item>
     <item msgid="8374996688066472414">"citește clipboardul"</item>
     <item msgid="3045529469061083747">"modifică clipboardul"</item>
+    <item msgid="5124443975763747838">"butoane media"</item>
+    <item msgid="4547883971364273343">"focalizare audio"</item>
+    <item msgid="2603878814882344450">"volum principal"</item>
+    <item msgid="7136963238377062018">"volum voce"</item>
+    <item msgid="4270236897655923007">"volum sonerie"</item>
+    <item msgid="6325739889222559394">"volum media"</item>
+    <item msgid="5762123934816216821">"volum alarmă"</item>
+    <item msgid="785049718065337473">"volum notificări"</item>
+    <item msgid="6700305533746877052">"volumul Bluetooth"</item>
+    <item msgid="2029227495214047094">"mențineți activ"</item>
+    <item msgid="26109888160231211">"monitorizarea locației"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Locație"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Redă conținut audio"</item>
     <item msgid="136815868796597058">"Citește clipboardul"</item>
     <item msgid="5238692940326972503">"Modifică clipboardul"</item>
+    <item msgid="5753789168376302997">"Butoane media"</item>
+    <item msgid="3265262911688671938">"Focalizare audio"</item>
+    <item msgid="2098976479485046797">"Volum principal"</item>
+    <item msgid="5660213838861789350">"Volum voce"</item>
+    <item msgid="7983336752371254444">"Volum sonerie"</item>
+    <item msgid="7878027809189330917">"Volum media"</item>
+    <item msgid="7260546305036218513">"Volum alarmă"</item>
+    <item msgid="9103719301075748925">"Volum notificări"</item>
+    <item msgid="7025966722295861512">"Volum Bluetooth"</item>
+    <item msgid="4665183401128289653">"Mențineți activ"</item>
+    <item msgid="8584357129746649222">"Locație"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Scurtă"</item>
     <item msgid="2560532955514699713">"Medie"</item>
     <item msgid="2372711992605524591">"Lungă"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (depanare)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Utilizați Dalvik"</item>
+    <item msgid="5131846588686178907">"Utilizați ART"</item>
+    <item msgid="4530003713865319928">"Utilizați ART, versiunea de depanare"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nu verificaţi niciodată"</item>
     <item msgid="6042769699089883931">"Verificaţi doar pentru conţinut DRM"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Pe ecran ca linii"</item>
     <item msgid="120512413928262547">"În adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Dezactivată"</item>
+    <item msgid="7688197031296835369">"Afișați zonele cu suprapunere"</item>
+    <item msgid="8332661909019981149">"Afișați contorul de suprapunere"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limita standard"</item>
     <item msgid="4071574792028999443">"Nu există procese de fundal"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 728a56b661a..f0ddbbdc9d3 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Dacă permiteţi roamingul de date, puteţi acumula cheltuieli considerabile pentru roaming!\n\nAceastă setare afectează toţi utilizatorii de pe această tabletă."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Dacă permiteţi roamingul de date, puteţi acumula cheltuieli considerabile pentru roaming!\n\nAceastă setare afectează toţi utilizatorii de pe acest telefon."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Permiteţi roamingul de date?"</string>
     <string name="networks" msgid="6333316876545927039">"Selectarea operatorului"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Alegeţi un operator de reţea"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Necesită un cod PIN numeric sau o parolă de decriptare a tabletei la fiecare pornire a acesteia"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Necesită un cod PIN numeric sau o parolă de decriptare a telefonului la fiecare pornire a acestuia"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Criptat"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puteţi să criptaţi conturi, setări, aplicaţii descărcate şi datele acestora, fişiere media şi alte tipuri de fişiere. După criptarea tabletei, trebuie să introduceţi un cod PIN numeric sau o parolă pentru a o decripta de fiecare dată când o porniţi. Nu puteţi decripta tableta decât prin resetarea configurării din fabrică, ceea ce va şterge toate datele de pe aceasta."\n\n"Criptarea poate dura cel puţin o oră. Trebuie să începeţi cu o baterie încărcată şi să ţineţi tableta conectată până la finalizarea criptării. Întreruperea procesului de criptare poate duce la pierderea tuturor datelor sau a unor părţi din acestea."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Puteţi să criptaţi conturi, setări, aplicaţii descărcate şi datele acestora, fişiere media şi alte tipuri de fişiere. După criptarea telefonului, trebuie să introduceţi un cod PIN numeric sau o parolă pentru a-l decripta de fiecare dată când îl porniţi. Nu puteţi decripta telefonul decât prin resetarea configurării din fabrică, ceea ce va şterge toate datele de pe acesta."\n\n"Criptarea poate dura cel puţin o oră. Trebuie să începeţi cu o baterie încărcată şi să ţineţi telefonul conectat până la finalizarea criptării. Întreruperea procesului de criptare poate duce la pierderea tuturor datelor sau a unor părţi din acestea."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puteţi să criptaţi conturi, setări, aplicaţii descărcate şi datele acestora, fişiere media şi alte tipuri de fişiere. După criptarea tabletei, trebuie să introduceţi un cod PIN numeric sau o parolă pentru a o decripta de fiecare dată când o porniţi. Nu puteţi decripta tableta decât prin resetarea configurării din fabrică, ceea ce va şterge toate datele de pe aceasta.\n\nCriptarea poate dura cel puţin o oră. Trebuie să începeţi cu o baterie încărcată şi să ţineţi tableta conectată până la finalizarea criptării. Întreruperea procesului de criptare poate duce la pierderea tuturor datelor sau a unor părţi din acestea."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Puteţi să criptaţi conturi, setări, aplicaţii descărcate şi datele acestora, fişiere media şi alte tipuri de fişiere. După criptarea telefonului, trebuie să introduceţi un cod PIN numeric sau o parolă pentru a-l decripta de fiecare dată când îl porniţi. Nu puteţi decripta telefonul decât prin resetarea configurării din fabrică, ceea ce va şterge toate datele de pe acesta.\n\nCriptarea poate dura cel puţin o oră. Trebuie să începeţi cu o baterie încărcată şi să ţineţi telefonul conectat până la finalizarea criptării. Întreruperea procesului de criptare poate duce la pierderea tuturor datelor sau a unor părţi din acestea."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Criptaţi tableta"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Criptaţi telefonul"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Încărcaţi bateria şi încercaţi din nou."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Încercaţi din nou peste <xliff:g id="DELAY">^1</xliff:g> (de) secunde."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Introduceţi parola"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Criptare nereuşită"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Criptarea a fost întreruptă şi nu se poate finaliza. Prin urmare, datele de pe tableta dvs. nu mai sunt accesibile. "\n\n"Pentru a relua utilizarea tabletei, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi tableta după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Criptarea a fost întreruptă şi nu se poate finaliza. Prin urmare, datele de pe telefonul dvs. nu mai sunt accesibile. "\n\n"Pentru a relua utilizarea telefonului, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi telefonul după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Criptarea a fost întreruptă şi nu se poate finaliza. Prin urmare, datele de pe tableta dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea tabletei, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi tableta după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Criptarea a fost întreruptă şi nu se poate finaliza. Prin urmare, datele de pe telefonul dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea telefonului, trebuie să efectuaţi o resetare la valorile din fabrică. Când configuraţi telefonul după resetare, veţi putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Comutaţi metoda de introducere"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Alegeţi blocare ecran"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Aleg. blocare rezervă"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Se conectează"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Conectat"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponibil"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Se utilizează"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Setări de afişare"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Deconectaţi?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Această acţiune va încheia conexiunea cu:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Dezactivată"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponibilă, deoarece NFC este oprit"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"După activarea acestei funcţii, puteţi transmite conţinutul aplicaţiilor către un alt dispozitiv compatibil NFC, ţinând cele două dispozitive apropiate unul de celălalt. De exemplu, puteţi să transmiteţi pagini din browser, videoclipuri YouTube, persoane din agendă şi multe altele."\n\n"Nu trebuie decât să apropiaţi cele două dispozitive (de obicei, aşezându-le unul în spatele celuilalt) şi să atingeţi ecranul. Aplicaţia determină apoi ce poate fi transmis."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"După activarea acestei funcţii, puteţi transmite conţinutul aplicaţiilor către un alt dispozitiv compatibil NFC, ţinând cele două dispozitive apropiate unul de celălalt. De exemplu, puteţi să transmiteţi pagini din browser, videoclipuri YouTube, persoane din agendă şi multe altele.\n\nNu trebuie decât să apropiaţi cele două dispozitive (de obicei, aşezându-le unul în spatele celuilalt) şi să atingeţi ecranul. Aplicaţia determină apoi ce poate fi transmis."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Descoperire serviciu de reţea"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permite aplicaţiilor de pe alte dispozitive să descopere aplicaţii pe acest dispozitiv"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Securizată cu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", securizată cu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Niciuna"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pentru a îmbunătăți precizia locației, precum și pentru alte scopuri, <xliff:g id="APP_NAME">%1$s</xliff:g> solicită permisiunea să activeze scanarea rețelelor, chiar și atunci când rețeaua Wi-Fi este dezactivată."\n\n"Permiteți acest lucru pentru toate aplicațiile care solicită scanarea?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pentru a îmbunătăți precizia locației, precum și pentru alte scopuri, <xliff:g id="APP_NAME">%1$s</xliff:g> solicită permisiunea să activeze scanarea rețelelor, chiar și atunci când rețeaua Wi-Fi este dezactivată.\n\nPermiteți acest lucru pentru toate aplicațiile care solicită scanarea?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permiteți"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Respingeți"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectaţi-vă"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"AVERTISMENT: puteţi acumula costuri suplimentare pentru date de la operator.\n\nConfigurarea tabletei poate presupune o activitate semnificativă în reţea."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AVERTISMENT: puteţi acumula costuri suplimentare pentru date de la operator.\n\nConfigurarea telefonului poate presupune o activitate semnificativă în reţea."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"AVERTISMENT: tableta nu va putea verifica actualizarea software-ului decât după ce aveți o conexiune de internet."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"AVERTISMENT: telefonul nu va putea verifica actualizarea software-ului decât după ce aveți o conexiune de internet."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tableta nu s-a putut conecta la această rețea Wi-Fi."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Cod PIN incorect"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Codurile PIN nu corespund"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Nu se poate schimba codul PIN."\n"Codul PIN poate fi incorect."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Nu se poate schimba codul PIN.\nCodul PIN poate fi incorect."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Codul PIN pentru SIM a fost modificat"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Nu se poate modifica starea de blocare a cardului SIM."\n"Codul PIN poate fi incorect."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Nu se poate modifica starea de blocare a cardului SIM.\nCodul PIN poate fi incorect."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Anulaţi"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stare tabletă"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Resetarea configurării din fabrică"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Șterge toate datele de pe tabletă"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Șterge toate datele de pe telefon"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Această acţiune va şterge toate datele din "<b>"stocarea internă"</b>" a tabletei dvs., inclusiv:"\n\n<li>"Contul dvs. Google;"</li>\n<li>"datele şi setările sistemului şi ale aplicaţiilor;"</li>\n<li>"aplicaţiile descărcate."</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Această acţiune va şterge toate datele din "<b>"stocarea internă"</b>" a telefonului dvs., inclusiv:"\n\n<li>"Contul dvs. Google;"</li>\n<li>"datele şi setările sistemului şi ale aplicaţiilor;"</li>\n<li>"aplicaţiile descărcate."</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"În prezent sunteţi conectat(ă) la următoarele conturi:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Această acţiune va şterge toate datele din "<b>"stocarea internă"</b>" a tabletei dvs., inclusiv:\n\n"<li>"Contul dvs. Google;"</li>\n<li>"datele şi setările sistemului şi ale aplicaţiilor;"</li>\n<li>"aplicaţiile descărcate."</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Această acţiune va şterge toate datele din "<b>"stocarea internă"</b>" a telefonului dvs., inclusiv:\n\n"<li>"Contul dvs. Google;"</li>\n<li>"datele şi setările sistemului şi ale aplicaţiilor;"</li>\n<li>"aplicaţiile descărcate."</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"În prezent sunteţi conectat(ă) la următoarele conturi:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzică"</li>\n<li>"Fotografii"</li>\n<li>"Alte date ale utilizatorului"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Pentru a şterge muzică, imagini şi alte date ale utilizatorului, "<b>"stocarea USB"</b>" trebuie să fie ştearsă."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Pentru a şterge muzică, imagini şi alte date ale utilizatorului, "<b>"cardul SD"</b>" trebuie să fie şters."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Procese memorie cache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Resetați pref. aplicații"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Resetaţi pref. aplicații?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Astfel vor fi resetate toate preferinţele pentru:"\n\n" "<li>"aplicaţii dezactivate;"</li>\n" "<li>"notificări de aplicaţii dezactivate;"</li>\n" "<li>"aplicaţii prestabilite pentru acţiuni;"</li>\n" "<li>"restricţii privind datele de fundal pentru aplicaţii."</li>\n\n" Nu veţi pierde nimic din datele aplicaţiilor."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Astfel vor fi resetate toate preferinţele pentru:\n\n "<li>"aplicaţii dezactivate;"</li>\n" "<li>"notificări de aplicaţii dezactivate;"</li>\n" "<li>"aplicaţii prestabilite pentru acţiuni;"</li>\n" "<li>"restricţii privind datele de fundal pentru aplicaţii."</li>\n\n" Nu veţi pierde nimic din datele aplicaţiilor."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Resetaţi aplicaţiile"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gestionaţi spaţiul"</string>
     <string name="filter" msgid="2018011724373033887">"Filtraţi"</string>
@@ -1241,9 +1242,7 @@
     <!-- no translation found for keyboard_layout_default_label (2952672513543482165) -->
     <skip />
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Aspecte tastatură"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Dicţionarul utilizatorului"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Dicţionar personal"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Dicţionare personale"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Dicționar personal"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Adăugaţi"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Adăugaţi în dicţionar"</string>
@@ -1304,6 +1303,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Includeţi în meniul de pornire opţiunea de a executa un raport despre erori"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Activ permanent"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ecranul nu va fi inactiv pe durata încărcării"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activați jurnalul de examinare HCI Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Înregistrați toate pachetele HCI Bluetooth într-un fișier"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Select. mediul de execuție"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Select. mediul de execuție"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Reporniți pentru a schimba mediul de execuție de la <xliff:g id="OLD">%1$s</xliff:g> la <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permiteţi locaţiile fictive"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permiteţi locaţiile fictive"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Permiteţi depanarea USB?"</string>
@@ -1316,11 +1320,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Protejaţi stocarea USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplicaţiile trebuie să ceară permisiunea de a citi stocarea USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Protejaţi stocarea USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Când stocarea USB este protejată, aplicaţiile trebuie să solicite permisiunea de a citi datele de pe stocarea externă."\n\n"Este posibil ca unele aplicaţii să nu funcţioneze înainte de a fi actualizate de către dezvoltatorii lor."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Când stocarea USB este protejată, aplicaţiile trebuie să solicite permisiunea de a citi datele de pe stocarea externă.\n\nEste posibil ca unele aplicaţii să nu funcţioneze înainte de a fi actualizate de către dezvoltatorii lor."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Protejaţi cardul SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplicaţiile trebuie să ceară permisiunea de a citi cardul SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Protejaţi cardul SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Când cardul SD este protejat, aplicaţiile trebuie să solicite permisiunea de a citi datele de pe stocarea externă."\n\n"Este posibil ca unele aplicaţii să nu funcţioneze înainte de a fi actualizate de către dezvoltatorii lor."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Când cardul SD este protejat, aplicaţiile trebuie să solicite permisiunea de a citi datele de pe stocarea externă.\n\nEste posibil ca unele aplicaţii să nu funcţioneze înainte de a fi actualizate de către dezvoltatorii lor."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Aplicație terminal locală"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Activați aplicația terminal care oferă acces la shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Alegeţi obiectul gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Alegeţi obiectul widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Creaţi widgetul şi permiteţi accesul?"</string>
@@ -1341,11 +1347,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Servicii"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</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_screen_magnification_summary" msgid="2380627654189671754">"După activarea acestei funcţii, puteţi mări şi micşora atingând de trei ori ecranul.\n\nÎn timp ce măriţi, puteţi:\n"<ul><li>"să deplasaţi: deplasaţi două sau mai multe degete pe ecran;"</li>\n<li>"să ajustaţi nivelul de zoom: ciupiţi cu două sau mai multe degete ori îndepărtați-le."</li></ul>\n\n"De asemenea, puteţi să măriţi temporar ce se află sub degetul dvs. atingând ecranul de trei ori şi menţinând degetul pe ecran. În această stare mărită, puteţi să glisaţi degetul pentru a explora diferite părţi ale ecranului. Ridicaţi degetul pentru a reveni la starea anterioară.\n\nNotă: atingerea triplă pentru mărire funcţionează peste tot, cu excepţia tastaturii şi a barei de navigare."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Comandă rapidă accesibilitate"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Activat"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Dezactivată"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"După activarea acestei funcţii, puteţi să activaţi rapid funcţiile de accesibilitate în doi paşi:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"După activarea acestei funcţii, puteţi să activaţi rapid funcţiile de accesibilitate în doi paşi:\n\nPasul 1: apăsaţi şi menţineţi apăsat butonul de pornire până când auziţi un sunet sau simţiţi o vibraţie.\n\nPasul 2: atingeţi ecranul cu două degete şi menţineţi degetele pe ecran până când auziţi o confirmare audio.\n\nDacă gadgetul are mai mulţi utilizatori, folosirea acestei comenzi rapide pe ecranul de blocare activează temporar accesibilitatea până când gadgetul este deblocat."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Text mare"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Mărirea ecranului"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualizaţi auto. mărirea ecranului"</string>
@@ -1367,6 +1373,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Serviciul TalkBack oferă feedback vocal pentru a ajuta utilizatorii nevăzători şi cu probleme de vedere. Doriţi să îl instalaţi în mod gratuit din Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nu a fost furnizată o descriere."</string>
     <string name="settings_button" msgid="3006713718908152930">"Setări"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Printare"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Setări de printare"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Servicii"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Utilizați <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> poate primi documentele pe care le printați. Aceste documente pot conține informații delicate."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Nu există servicii instalate"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Setări"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Adăugați imprimante"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Activată"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Dezactiv."</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Acumulator"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Ce funcţii au utilizat bateria"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Date utilizare baterie nedisp."</string>
@@ -1406,8 +1422,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Funcționare Wi-Fi"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tabletă"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Date trimise"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Date primite"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Date mobile trimise"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Date mobile primite"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Date Wi-Fi trimise"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Date Wi-Fi primite"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Durată de activitate"</string>
@@ -1461,6 +1479,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Înălţime"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afectează tonul textului vorbit"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Limbă"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nu ați selectat limba"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Setează vocea caracteristică limbii pentru textul vorbit"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Ascultaţi un exemplu"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Redaţi o demonstraţie scurtă a sintetizării vorbirii"</string>
@@ -1595,7 +1614,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP nu este acceptat."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Nu puteți configura o conexiune Wi-Fi EAP în timpul instalării. După instalare, puteți face acest lucru în Setări &gt; Rețele wireless."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Conectarea poate dura câteva minute..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Atingeți "<b>"Înainte"</b>" pentru a continua configurarea."\n\n"Atingeți "<b>"Înapoi"</b>" pentru a vă conecta la altă rețea Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Atingeți "<b>"Înainte"</b>" pentru a continua configurarea.\n\nAtingeți "<b>"Înapoi"</b>" pentru a vă conecta la altă rețea Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronizare activată"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronizare dezactivată"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Eroare de sincronizare."</string>
@@ -1623,7 +1642,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Calendar"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Agendă"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Bun venit la Sincronizarea Google!"</font>" "\n"O abordare Google asupra sincronizării datelor, care vă permite accesul la agenda dvs., la întâlniri şi la multe alte informaţii, oriunde v-aţi afla."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Bun venit la Sincronizarea Google!"</font>" \nO abordare Google asupra sincronizării datelor, care vă permite accesul la agenda dvs., la întâlniri şi la multe alte informaţii, oriunde v-aţi afla."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Setări privind sincronizarea aplicaţiei"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Datele şi sincronizarea"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Schimbaţi parola"</string>
@@ -1677,8 +1696,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Depanați suprapunerea"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Dezactivaţi suprapun. HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Utilizaţi mereu GPU pentru compunerea ecranului"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Monitorizări OpenGL"</string>
@@ -1739,11 +1757,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Dezact. date de fundal în reţele mobile. Dacă sunt dispon., utiliz. reţele non-mobile."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Pt. restr. dat. fundal pt. aplic., set. întâi lim. pt. date mob."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Restricţionaţi datele de fundal?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Această funcţie poate face ca o aplicaţie care depinde de datele de fundal să nu mai funcţioneze când sunt disponibile numai reţele mobile."\n\n"Puteţi găsi comenzi mai adecvate pentru utilizarea datelor în setările disponibile în cadrul aplicaţiei."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Această funcţie poate face ca o aplicaţie care depinde de datele de fundal să nu mai funcţioneze când sunt disponibile numai reţele mobile.\n\nPuteţi găsi comenzi mai adecvate pentru utilizarea datelor în setările disponibile în cadrul aplicaţiei."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Restricţionarea datelor de fundal este posibilă numai dacă aţi setat o limită de date mobile."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Activaţi sinc. autom. a datelor?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Modificările conturilor dvs. pe web vor fi copiate în mod automat pe tabletă."\n\n"Unele conturi pot să copieze, de asemenea, în mod automat toate modificările pe care le efectuaţi pe tabletă pe web. Aşa funcţionează un Cont Google."\n\n"Pentru a alege ce tipuri de informaţii se pot sincroniza în fiecare cont, accesaţi Setări &gt; Conturi."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Modificările conturilor dvs. pe web vor fi copiate în mod automat pe telefon."\n\n"Unele conturi pot să copieze, de asemenea, în mod automat toate modificările pe care le efectuaţi pe telefon pe web. Aşa funcţionează un Cont Google."\n\n"Pentru a alege ce tipuri de informaţii se pot sincroniza în fiecare cont, accesaţi Setări &gt; Conturi."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Modificările conturilor dvs. pe web vor fi copiate în mod automat pe tabletă.\n\nUnele conturi pot să copieze, de asemenea, în mod automat toate modificările pe care le efectuaţi pe tabletă pe web. Aşa funcţionează un Cont Google.\n\nPentru a alege ce tipuri de informaţii se pot sincroniza în fiecare cont, accesaţi Setări &gt; Conturi."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Modificările conturilor dvs. pe web vor fi copiate în mod automat pe telefon.\n\nUnele conturi pot să copieze, de asemenea, în mod automat toate modificările pe care le efectuaţi pe telefon pe web. Aşa funcţionează un Cont Google.\n\nPentru a alege ce tipuri de informaţii se pot sincroniza în fiecare cont, accesaţi Setări &gt; Conturi."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Dezact. sinc. autom. a datelor?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Această acţiune va economisi date şi durata bateriei, dar va trebui să sincronizaţi fiecare cont manual pentru a culege informaţiile recente. În plus, nu veţi primi notificări atunci când apar actualizări."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de resetare a ciclului de utilizare"</string>
@@ -1752,12 +1770,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Setaţi un avertisment de utilizare a datelor"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Setaţi o limită de utilizare a datelor"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitarea utilizării datelor"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Conexiunea de date mobile va fi dezactivată la atingerea limitei specificate."\n\n"Din moment ce utilizarea de date este măsurată de tableta dvs., iar operatorul poate contabiliza în mod diferit utilizarea, vă recomandăm să utilizaţi o limită estimativă."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Conexiunea de date mobile va fi dezactivată la atingerea limitei specificate."\n\n"Din moment ce utilizarea de date este măsurată de telefonul dvs., iar operatorul poate contabiliza în mod diferit utilizarea, vă recomandăm să utilizaţi o limită estimativă."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Conexiunea de date mobile va fi dezactivată la atingerea limitei specificate.\n\nDin moment ce utilizarea de date este măsurată de tableta dvs., iar operatorul poate contabiliza în mod diferit utilizarea, vă recomandăm să utilizaţi o limită estimativă."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Conexiunea de date mobile va fi dezactivată la atingerea limitei specificate.\n\nDin moment ce utilizarea de date este măsurată de telefonul dvs., iar operatorul poate contabiliza în mod diferit utilizarea, vă recomandăm să utilizaţi o limită estimativă."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Restricţionaţi datele de fundal?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Dacă limitați transferul de date mobile în fundal, unele aplicații și servicii nu vor funcționa decât dacă sunteți conectat(ă) la o rețea Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Dacă limitați transferul de date mobile în fundal, unele aplicații și servicii nu vor funcționa decât dacă sunteți conectat(ă) la o rețea Wi-Fi."\n\n"Această setare afectează toți utilizatorii de pe această tabletă."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Dacă limitați transferul de date mobile în fundal, unele aplicații și servicii nu vor funcționa decât dacă sunteți conectat(ă) la o rețea Wi-Fi."\n\n"Această setare afectează toți utilizatorii de pe acest telefon."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Dacă limitați transferul de date mobile în fundal, unele aplicații și servicii nu vor funcționa decât dacă sunteți conectat(ă) la o rețea Wi-Fi.\n\nAceastă setare afectează toți utilizatorii de pe această tabletă."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Dacă limitați transferul de date mobile în fundal, unele aplicații și servicii nu vor funcționa decât dacă sunteți conectat(ă) la o rețea Wi-Fi.\n\nAceastă setare afectează toți utilizatorii de pe acest telefon."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"avertisment"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limită"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicaţii eliminate"</string>
@@ -1844,8 +1862,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Utilizator"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil limitat"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Adăugaţi un utilizator nou"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Puteți să permiteți accesul la acest gadget altor persoane, prin crearea unor utilizatori suplimentari. Fiecare utilizator are propriul spațiu, pe care îl poate personaliza cu propriile sale aplicații, imagini de fundal etc. De asemenea, utilizatorii pot ajusta setările tabletei, cum ar fi setările pentru Wi-Fi, care afectează pe toți ceilalți utilizatori."\n\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_add_user_message_long" msgid="3086244205384741788">"Puteți să permiteți accesul la acest gadget altor persoane, prin crearea unor utilizatori suplimentari. Fiecare utilizator are propriul spațiu, pe care îl poate personaliza cu propriile sale aplicații, imagini de fundal etc. De asemenea, utilizatorii pot ajusta setările tabletei, cum ar fi setările pentru Wi-Fi, care afectează pe toți ceilalți utilizatori.\n\nDupă ce creați un utilizator nou, respectiva persoană trebuie să parcurgă un proces de configurare.\n\nOricare utilizator poate accepta permisiunile aplicațiilor actualizate în numele tuturor celorlalți utilizatori."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"După ce creaţi un utilizator nou, respectiva persoană trebuie să parcurgă un proces de configurare.\n\nOricare utilizator poate accepta permisiunile aplicaţiilor actualizate în numele tuturor celorlalţi utilizatori."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configuraţi utilizatorul acum?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Asiguraţi-vă că respectiva persoană poate să preia tableta şi să îşi configureze propriul spaţiu"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Configurați profilul acum?"</string>
@@ -1876,6 +1894,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Această setare afectează toţi utilizatorii de pe acest telefon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Schimbaţi limba"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Modificaţi dimensiunea fontului"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Restricții"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Eliminați restricțiile"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Schimbați codul PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Afişaţi notificările"</string>
     <string name="help_label" msgid="1107174367904110532">"Ajutor"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Cont pentru conţinut"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index c63f13dc87f..3960a266235 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Местоположение"</item>
     <item msgid="255608127647030286">"Личные данные"</item>
     <item msgid="4588829735729884491">"SMS/MMS"</item>
-    <item msgid="8971765125227378270">"Устройство"</item>
+    <item msgid="886742181977884584">"Мультимедиа"</item>
+    <item msgid="7924928667052300589">"Устройство"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"приблизительное местоположение"</item>
@@ -252,7 +253,7 @@
     <item msgid="514615766544675057">"позвонить"</item>
     <item msgid="8181415497109310680">"чтение SMS"</item>
     <item msgid="6816551144382117307">"создание SMS"</item>
-    <item msgid="4600463921908905030">"получение SMS"</item>
+    <item msgid="4600463921908905030">"Получение SMS"</item>
     <item msgid="5958926493289432745">"получение экстренных SMS"</item>
     <item msgid="4945269495221089540">"получение MMS"</item>
     <item msgid="5570472453573929087">"получение сообщений WAP PUSH"</item>
@@ -261,12 +262,23 @@
     <item msgid="587124103118495063">"запись SMS на смарт-карту"</item>
     <item msgid="2320577158869025503">"изменение настроек"</item>
     <item msgid="1545733463471924009">"отображать поверх других элементов"</item>
-    <item msgid="3609046903962454582">"доступ к уведомлениям"</item>
+    <item msgid="3609046903962454582">"Доступ к уведомлениям"</item>
     <item msgid="4671646036128214513">"камера"</item>
     <item msgid="1097324338692486211">"записать аудио"</item>
     <item msgid="5031552983987798163">"воспроизвести аудио"</item>
     <item msgid="8374996688066472414">"считать из буфера обмена"</item>
     <item msgid="3045529469061083747">"изменить буфер обмена"</item>
+    <item msgid="5124443975763747838">"кнопки мультимедиа"</item>
+    <item msgid="4547883971364273343">"аудиофокус"</item>
+    <item msgid="2603878814882344450">"общая громкость"</item>
+    <item msgid="7136963238377062018">"громкость голоса"</item>
+    <item msgid="4270236897655923007">"громкость звонка"</item>
+    <item msgid="6325739889222559394">"громкость мультимедиа"</item>
+    <item msgid="5762123934816216821">"громкость будильника"</item>
+    <item msgid="785049718065337473">"громкость уведомлений"</item>
+    <item msgid="6700305533746877052">"громкость Bluetooth-устройств"</item>
+    <item msgid="2029227495214047094">"не отключать"</item>
+    <item msgid="26109888160231211">"Отслеживать местоположение"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Местоположение"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Воспроизвести аудио"</item>
     <item msgid="136815868796597058">"Считать из буфера обмена"</item>
     <item msgid="5238692940326972503">"Изменить буфер обмена"</item>
+    <item msgid="5753789168376302997">"Кнопки мультимедиа"</item>
+    <item msgid="3265262911688671938">"Аудиофокус"</item>
+    <item msgid="2098976479485046797">"Общая громкость"</item>
+    <item msgid="5660213838861789350">"Громкость голоса"</item>
+    <item msgid="7983336752371254444">"Громкость звонка"</item>
+    <item msgid="7878027809189330917">"Громкость мультимедиа"</item>
+    <item msgid="7260546305036218513">"Громкость будильника"</item>
+    <item msgid="9103719301075748925">"Громкость уведомлений"</item>
+    <item msgid="7025966722295861512">"Громкость Bluetooth-устройств"</item>
+    <item msgid="4665183401128289653">"Не отключать"</item>
+    <item msgid="8584357129746649222">"Местоположение"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Небольшая"</item>
     <item msgid="2560532955514699713">"Средняя"</item>
     <item msgid="2372711992605524591">"Большая"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (отладка)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Использовать Dalvik"</item>
+    <item msgid="5131846588686178907">"Использовать ART"</item>
+    <item msgid="4530003713865319928">"Использовать отладочную версию ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Никогда не проверять"</item>
     <item msgid="6042769699089883931">"Проверять только содержание DRM"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"На экране в виде линий"</item>
     <item msgid="120512413928262547">"В adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"ВЫКЛ"</item>
+    <item msgid="7688197031296835369">"Показывать области наложения"</item>
+    <item msgid="8332661909019981149">"Показывать число объектов"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартное ограничение"</item>
     <item msgid="4071574792028999443">"Без фоновых процессов"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 52d027c5b97..ad69cefb827 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -275,8 +275,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_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>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Запрос числового PIN-кода или пароля для дешифрования при каждом включении планшетного ПК"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Запрос числового PIN-кода или пароля для дешифрования при каждом включении телефона"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Зашифровано"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Можно зашифровать данные различных типов: аккаунты, настройки, загруженные приложения и их контент, мультимедийные и другие файлы. После этого при каждом включении устройства потребуется вводить PIN-код или пароль. Шифрование снимается только путем сброса настроек, в результате которого удаляются все данные."\n\n"Шифрование занимает не менее часа. Батарея должна быть полностью заряжена, а устройство подключено к источнику питания, пока шифрование не завершится. Если прервать его, данные будут частично или полностью потеряны."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Можно зашифровать данные различных типов: аккаунты, настройки, загруженные приложения и их контент, мультимедийные и другие файлы. После этого при каждом включении устройства потребуется вводить PIN-код или пароль. Шифрование снимается только путем сброса настроек, в результате которого удаляются все данные."\n\n"Шифрование занимает не менее часа. Батарея должна быть полностью заряжена, а устройство подключено к источнику питания, пока шифрование не завершится. Если прервать его, данные на устройстве будут частично или полностью потеряны."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Можно зашифровать данные различных типов: аккаунты, настройки, загруженные приложения и их контент, мультимедийные и другие файлы. После этого при каждом включении устройства потребуется вводить PIN-код или пароль. Шифрование снимается только путем сброса настроек, в результате которого удаляются все данные.\n\nШифрование занимает не менее часа. Батарея должна быть полностью заряжена, а устройство подключено к источнику питания, пока шифрование не завершится. Если прервать его, данные будут частично или полностью потеряны."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Можно зашифровать данные различных типов: аккаунты, настройки, загруженные приложения и их контент, мультимедийные и другие файлы. После этого при каждом включении устройства потребуется вводить PIN-код или пароль. Шифрование снимается только путем сброса настроек, в результате которого удаляются все данные.\n\nШифрование занимает не менее часа. Батарея должна быть полностью заряжена, а устройство подключено к источнику питания, пока шифрование не завершится. Если прервать его, данные на устройстве будут частично или полностью потеряны."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Зашифровать данные"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Зашифровать данные"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Зарядите батарею и повторите попытку."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Повторите попытку через <xliff:g id="DELAY">^1</xliff:g> с."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Введите пароль"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Сбой шифрования"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Данные на вашем планшетном ПК больше недоступны из-за того, что шифрование было прервано. "\n\n"Чтобы дальше использовать устройство, нужно сбросить настройки. После этого вы сможете восстановить все данные, для которых в аккаунте Google были созданы резервные копии."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Данные на вашем телефоне больше недоступны из-за того, что шифрование было прервано. "\n\n"Чтобы дальше использовать устройство, нужно сбросить настройки. После этого вы сможете восстановить все данные, для которых в аккаунте Google были созданы резервные копии."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Данные на вашем планшетном ПК больше недоступны из-за того, что шифрование было прервано. \n\nЧтобы дальше использовать устройство, нужно сбросить настройки. После этого вы сможете восстановить все данные, для которых в аккаунте Google были созданы резервные копии."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Данные на вашем телефоне больше недоступны из-за того, что шифрование было прервано. \n\nЧтобы дальше использовать устройство, нужно сбросить настройки. После этого вы сможете восстановить все данные, для которых в аккаунте Google были созданы резервные копии."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Сменить способ ввода"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Блокировка экрана"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Доп. способ блокировки"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Подключение…"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Подключен"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Доступен"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Используется"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Настройки экрана"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Отключиться?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Произойдет разъединение с устройством&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,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">"Когда включена эта функция, вы можете обмениваться данными между устройствами, просто приложив их друг к другу."\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="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Защита <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", защита <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Нет"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Чтобы определение местоположения и некоторые другие функции работали лучше, приложению \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" необходимо выполнять поиск сетей, даже если модуль Wi-Fi отключен."\n\n"Разрешить?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Чтобы определение местоположения и некоторые другие функции работали лучше, приложению \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" необходимо выполнять поиск сетей, даже если модуль Wi-Fi отключен.\n\nРазрешить?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Разрешить"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Отклонить"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Подключить"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"ВНИМАНИЕ! Возможны дополнительные расходы на услуги оператора связи.\n\nНастройка устройства может потребовать передачи большого объема данных по сети."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ВНИМАНИЕ! Возможны дополнительные расходы на услуги оператора связи.\n\nНастройка устройства может потребовать передачи большого объема данных по сети."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ВНИМАНИЕ! Без подключения к Интернету невозможно проверить наличие обновлений для ПО."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ВНИМАНИЕ! Без подключения к Интернету невозможно проверить наличие обновлений для ПО."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Не удалось подключиться к сети Wi-Fi."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN-код SIM-карты"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Неверный PIN-код"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN-коды не совпадают"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Не удается изменить PIN."\n"Возможно, код введен неверно."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Не удается изменить PIN.\nВозможно, код введен неверно."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN-код SIM-карты успешно изменен"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Не удалось изменить состояние блокировки SIM-карты."\n"Возможно, введен неверный PIN-код."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Не удалось изменить состояние блокировки SIM-карты.\nВозможно, введен неверный PIN-код."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"ОК"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Отмена"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Состояние планшетного ПК"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Сброс настроек"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Возврат к заводским настройкам и удаление всех данных из памяти планшетного ПК"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Возврат к заводским настройкам и удаление всех данных из памяти телефона"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:"\n\n<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:"\n\n<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Аккаунты, добавленные на этом устройстве:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:\n\n"<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Будут удалены все данные из "<b>"внутренней памяти"</b>" устройства, в том числе:\n\n"<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Загруженные приложения"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Аккаунты, добавленные на этом устройстве:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музыка"</li>\n<li>"Фото"</li>\n<li>"Другие данные"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Чтобы удалить музыку, изображения и другие пользовательские данные, необходимо очистить "<b>"USB-накопитель"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Чтобы удалить музыку, фотографии и другие пользовательские данные, необходимо очистить "<b>"SD-карту"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Показать процессы в кэше"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Сбросить настройки"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Сбросить настройки?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Будут сброшены следующие настройки:"\n\n" "<li>"список отключенных приложений;"</li>\n" "<li>"уведомления для отключенных приложений;"</li>\n" "<li>"список приложений по умолчанию;"</li>\n" "<li>"ограничения на передачу данных в фоновом режиме."</li>\n\n" Данные приложений удалены не будут."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Будут сброшены следующие настройки:\n\n "<li>"список отключенных приложений;"</li>\n" "<li>"уведомления для отключенных приложений;"</li>\n" "<li>"список приложений по умолчанию;"</li>\n" "<li>"ограничения на передачу данных в фоновом режиме."</li>\n\n" Данные приложений удалены не будут."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Да"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Управление местом"</string>
     <string name="filter" msgid="2018011724373033887">"Фильтр"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Для смены нажмите CTRL + Пробел"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"По умолчанию"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Раскладка клавиатуры"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Словарь пользователя"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Пользовательский словарь"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Пользовательские словари"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Пользовательский словарь"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Добавить"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Добавление в словарь"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Показывать в меню опцию отправки отчета об ошибке"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Не выключать экран"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Во время зарядки экран будет всегда включен"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Включить журнал трансляции операций HCI Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Сохранять все пакеты HCI Bluetooth в файле"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Выберите среду"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Среда выполнения"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Перезагрузить устройство, чтобы сменить среду выполнения с <xliff:g id="OLD">%1$s</xliff:g> на <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Фиктивные местоположения"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешить использование фиктивных местоположений"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Разрешить отладку USB?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Защитить USB-накопитель"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Запрашивать разрешение для считывания данных с USB-накопителя"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Защитить USB-накопитель?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Если USB-накопитель защищен, приложения должны запрашивать разрешение для считывания данных с него."\n\n"Некоторые приложения могут не работать. В этом случае дождитесь, пока они не обновятся."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Если USB-накопитель защищен, приложения должны запрашивать разрешение для считывания данных с него.\n\nНекоторые приложения могут не работать. В этом случае дождитесь, пока они не обновятся."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Защитить SD-карту"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Запрашивать разрешение для считывания данных с SD-карты"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Защитить SD-карту?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Если SD-карта защищена, приложения должны запрашивать разрешение для считывания данных с нее."\n\n"Некоторые приложения могут не работать. В этом случае дождитесь, пока они не обновятся."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Если SD-карта защищена, приложения должны запрашивать разрешение для считывания данных с нее.\n\nНекоторые приложения могут не работать. В этом случае дождитесь, пока они не обновятся."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Локальный терминальный доступ"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Разрешить терминальный доступ к локальной оболочке"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Выбор гаджета"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Выберите виджет"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Создать виджет и разрешить доступ?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Службы"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Жесты для увеличения"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Эта функция позволяет увеличивать и уменьшать изображение, трижды нажав на экран."\n\n"При увеличенном масштабе можно:"\n<ul><li>"панорамировать – проведите пальцами по экрану;"</li>\n<li>"изменять масштаб – сведите или разведите пальцы."</li></ul>\n\n"Чтобы временно увеличить изображение под пальцем, трижды нажмите на экран и удерживайте его. Проведя пальцем, вы можете посмотреть на другие области экрана. Чтобы вернуть экран в прежнее состояние, уберите палец."\n\n"Примечание. Тройным нажатием увеличиваются все области, кроме клавиатуры и панели навигации."</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_global_gesture_preference_description" msgid="750438015254396963">"Вы сможете быстро включать специальные возможности. Вот как это сделать.\n\n1. Нажмите кнопку питания и удерживайте ее, пока не раздастся звуковой сигнал или вибросигнал.\n\n2. Нажмите на экран двумя пальцами и не отпускайте их, пока не услышите сообщение о том, что команда выполнена.\n\nЕсли устройством пользуется несколько человек, специальные возможности будут включены до тех пор, пока устройство не будет разблокировано или не будет выбран другой пользователь."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Крупный текст"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Масштаб"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Сохранять масштаб"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Бесплатное приложение TalkBack дает голосовое описание элементов интерфейса для пользователей с нарушением зрения. Установить его из Android Маркета?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Нет описания"</string>
     <string name="settings_button" msgid="3006713718908152930">"Настройки"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Печать"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Настройки печати"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Сервисы"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Включить <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"Сервису \"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>\" могут быть переданы документы, содержащие конфиденциальные данные."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Сервисов нет"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Настройки"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Добавить принтеры"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"ВКЛ"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"ВЫКЛ"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Батарея"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"На что расходуется заряд батареи"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Расход батареи неизвестен."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Модуль Wi-Fi включен"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Планшетный ПК"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Телефон"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Отправлено"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Получено"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Данные отправлены"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Данные получены"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Данные отправлены по сети Wi‑Fi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Данные получены по сети Wi‑Fi"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Аудио"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Видео"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Время работы"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Тон"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Влияет на высоту синтезированной речи"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Язык"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Язык не выбран"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Выбор языка для чтения текста"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Прослушать пример"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Воспроизвести краткую демонстрацию синтезированной речи"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP не поддерживается."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Во время установки нельзя настроить подключение к сети Wi-Fi с защитой EAP. Вы можете сделать это позже в меню \"Настройки &gt; Беспроводные сети\"."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Подключение может занять несколько минут..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Нажмите "<b>"Далее"</b>", чтобы продолжить настройку."\n\n"Нажмите "<b>"Назад"</b>", чтобы подключиться к другой сети Wi‑Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Нажмите "<b>"Далее"</b>", чтобы продолжить настройку.\n\nНажмите "<b>"Назад"</b>", чтобы подключиться к другой сети Wi‑Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Синхронизация включена"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синхронизация отключена"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Ошибка синхронизации."</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Отладка наложения"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Откл. аппарат. наложения"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Всегда использовать GPU при компоновке экрана"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Вкл. трассировку OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Откл. фоновый режим для моб. сетей (использовать другие сети)"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Сначала установите лимит для мобильного трафика."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Ограничение фонового режима"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Если будут доступны только мобильные сети, программы, зависящие от фонового режима, могут перестать работать."\n\n"Установите другие параметры передачи данных в настройках приложения."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Если будут доступны только мобильные сети, программы, зависящие от фонового режима, могут перестать работать.\n\nУстановите другие параметры передачи данных в настройках приложения."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Ограничение фонового режима возможно только при лимитировании мобильного трафика."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Включить автосинхронизацию?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Все изменения, внесенные в аккаунты на компьютере, будут автоматически скопированы на устройство."\n\n"В некоторых случаях также выполняется обратная синхронизация."\n\n"Чтобы указать для каждого аккаунта, какие данные нужно синхронизировать, перейдите в меню \"Настройки &gt; Аккаунты\"."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Все изменения, внесенные в аккаунты на компьютере, будут автоматически скопированы на устройство."\n\n"В некоторых случаях также выполняется обратная синхронизация."\n\n"Чтобы указать для каждого аккаунта, какие данные нужно синхронизировать, перейдите в меню \"Настройки &gt; Аккаунты\"."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Все изменения, внесенные в аккаунты на компьютере, будут автоматически скопированы на устройство.\n\nВ некоторых случаях также выполняется обратная синхронизация.\n\nЧтобы указать для каждого аккаунта, какие данные нужно синхронизировать, перейдите в меню \"Настройки &gt; Аккаунты\"."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Все изменения, внесенные в аккаунты на компьютере, будут автоматически скопированы на устройство.\n\nВ некоторых случаях также выполняется обратная синхронизация.\n\nЧтобы указать для каждого аккаунта, какие данные нужно синхронизировать, перейдите в меню \"Настройки &gt; Аккаунты\"."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Отключить автосинхронизацию?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Это сократит трафик и расход энергии. Однако чтобы получать новые данные, необходимо будет синхронизировать каждый аккаунт вручную. При этом уведомления об обновлениях отображаться не будут."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Удаление статистики"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Настройка предупреждения"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Лимитирование трафика"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Объем трафика ограничен"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"По достижении лимита трафика передача данных по мобильной сети будет отключена."\n\n"Во избежание дополнительных расходов старайтесь не достигать этого лимита, так как оператор и ваше устройство могут по-разному учитывать трафик."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"По достижении лимита трафика передача данных по мобильной сети будет отключена."\n\n"Во избежание дополнительных расходов старайтесь не достигать этого лимита, так как оператор и ваше устройство могут по-разному учитывать трафик."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"По достижении лимита трафика передача данных по мобильной сети будет отключена.\n\nВо избежание дополнительных расходов старайтесь не достигать этого лимита, так как оператор и ваше устройство могут по-разному учитывать трафик."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"По достижении лимита трафика передача данных по мобильной сети будет отключена.\n\nВо избежание дополнительных расходов старайтесь не достигать этого лимита, так как оператор и ваше устройство могут по-разному учитывать трафик."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Ограничение фонового режима"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Если ограничить передачу данных в фоновом режиме, некоторые приложения и службы не будут работать без подключения к сети Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Если ограничить передачу данных в фоновом режиме, некоторые приложения и службы не будут работать без подключения к сети Wi-Fi."\n\n"Настройки будут изменены для всех пользователей устройства."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Если ограничить передачу данных в фоновом режиме, некоторые приложения и службы не будут работать без подключения к сети Wi-Fi."\n\n"Настройки будут изменены для всех пользователей устройства."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Если ограничить передачу данных в фоновом режиме, некоторые приложения и службы не будут работать без подключения к сети Wi-Fi.\n\nНастройки будут изменены для всех пользователей устройства."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Если ограничить передачу данных в фоновом режиме, некоторые приложения и службы не будут работать без подключения к сети Wi-Fi.\n\nНастройки будут изменены для всех пользователей устройства."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="12">"Предупреждение"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="12">"Лимит"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Удаленные приложения"</string>
@@ -1845,8 +1863,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Добавить пользователя"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Профиль с огр. доступом"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Добавить пользователя"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Если вашим устройством пользуется кто-то ещё, создайте отдельные аккаунты. У каждого будет свое пространство, где можно, например, установить приложения или выбрать обои. Некоторые параметры, такие как настройки сети Wi-Fi, будут общими для всех."\n\n"Каждый новый пользователь должен выполнить настройку."\n\n"Пользователи могут разрешать обновления для любых аккаунтов на устройстве."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"Каждый новый пользователь должен выполнить настройку."\n\n"Пользователи могут разрешать обновления для любых аккаунтов на устройстве."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Если вашим устройством пользуется кто-то ещё, создайте отдельные аккаунты. У каждого будет свое пространство, где можно, например, установить приложения или выбрать обои. Некоторые параметры, такие как настройки сети Wi-Fi, будут общими для всех.\n\nКаждый новый пользователь должен выполнить настройку.\n\nПользователи могут разрешать обновления для любых аккаунтов на устройстве."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Каждый новый пользователь должен выполнить настройку.\n\nПользователи могут разрешать обновления для любых аккаунтов на устройстве."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Настроить аккаунт?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Если у пользователя нет возможности настроить аккаунт прямо сейчас, он сможет сделать это позже."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Настроить профиль?"</string>
@@ -1877,6 +1895,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Настройки будут изменены для всех пользователей устройства."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Измените язык"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Измените размер шрифта"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Ограничения"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Отменить ограничения"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Изменить PIN-код"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Включить уведомления"</string>
     <string name="help_label" msgid="1107174367904110532">"Справка"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Аккаунт для контента"</string>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 6ab5e68171b..41f8e5a2175 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Poloha"</item>
     <item msgid="255608127647030286">"Osobné"</item>
     <item msgid="4588829735729884491">"SMS a MMS"</item>
-    <item msgid="8971765125227378270">"Zariadenie"</item>
+    <item msgid="886742181977884584">"Médiá"</item>
+    <item msgid="7924928667052300589">"Zariadenie"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"približná poloha"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"prehrávanie zvuku"</item>
     <item msgid="8374996688066472414">"načítať schránku"</item>
     <item msgid="3045529469061083747">"upraviť schránku"</item>
+    <item msgid="5124443975763747838">"mediálne tlačidlá"</item>
+    <item msgid="4547883971364273343">"zvukové zameranie"</item>
+    <item msgid="2603878814882344450">"hlavná hlasitosť"</item>
+    <item msgid="7136963238377062018">"hlasitosť hlasu"</item>
+    <item msgid="4270236897655923007">"hlasitosť zvonenia"</item>
+    <item msgid="6325739889222559394">"hlasitosť médií"</item>
+    <item msgid="5762123934816216821">"hlasitosť budíka"</item>
+    <item msgid="785049718065337473">"hlasitosť upozornení"</item>
+    <item msgid="6700305533746877052">"hlasitosť bluetooth"</item>
+    <item msgid="2029227495214047094">"zakázať režim spánku"</item>
+    <item msgid="26109888160231211">"sledovať polohu"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Poloha"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Prehrať zvuk"</item>
     <item msgid="136815868796597058">"Načítať schránku"</item>
     <item msgid="5238692940326972503">"Upraviť schránku"</item>
+    <item msgid="5753789168376302997">"Tlačidlá médií"</item>
+    <item msgid="3265262911688671938">"Zameranie zvuku"</item>
+    <item msgid="2098976479485046797">"Hlavná hlasitosť"</item>
+    <item msgid="5660213838861789350">"Hlasitosť hlasu"</item>
+    <item msgid="7983336752371254444">"Hlasitosť zvonenia"</item>
+    <item msgid="7878027809189330917">"Hlasitosť médií"</item>
+    <item msgid="7260546305036218513">"Hlasitosť budíka"</item>
+    <item msgid="9103719301075748925">"Hlasitosť upozornení"</item>
+    <item msgid="7025966722295861512">"Hlasitosť zariadenia Bluetooth"</item>
+    <item msgid="4665183401128289653">"Zakázať režim spánku"</item>
+    <item msgid="8584357129746649222">"Poloha"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krátka"</item>
     <item msgid="2560532955514699713">"Stredná"</item>
     <item msgid="2372711992605524591">"Dlhá"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (ladenie)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Použiť nástroj Dalvik"</item>
+    <item msgid="5131846588686178907">"Použiť nástroj ART"</item>
+    <item msgid="4530003713865319928">"Použiť zostavu na ladenie programu ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nikdy nekontrolovať"</item>
     <item msgid="6042769699089883931">"Kontrolovať len obsah DRM"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Na obrazovke v podobe riadkov"</item>
     <item msgid="120512413928262547">"V adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Vypnuté"</item>
+    <item msgid="7688197031296835369">"Zobraziť oblasti prekreslení"</item>
+    <item msgid="8332661909019981149">"Zobraziť počítadlo prekreslení"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Štandardný limit"</item>
     <item msgid="4071574792028999443">"Žiadne procesy na pozadí"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 321c8625016..0de09c44b59 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Ak povolíte dátové služby pri roamingu, môžu sa účtovať vysoké poplatky za roaming!\n\nToto nastavenie ovplyvní všetkých používateľov tohto tabletu."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Ak povolíte dátové služby pri roamingu, môžu sa účtovať vysoké poplatky za roaming!\n\nToto nastavenie ovplyvní všetkých používateľov tohto telefónu."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Povoliť dátové služby pri roamingu?"</string>
     <string name="networks" msgid="6333316876545927039">"Výber operátora"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Zvoliť sieťového operátora"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Pri každom zapnutí tabletu požadovať číslo PIN alebo heslo na jeho dešifrovanie"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Pri každom zapnutí telefónu požadovať číslo PIN alebo heslo na jeho dešifrovanie"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrované"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Svoje účty, nastavenia, prevzaté aplikácie a ich údaje môžete šifrovať. Po zašifrovaní tabletu budete musieť pri každom zapnutí zadať číselný kód PIN alebo heslo a dešifrovať ho – toto šifrovanie budete môcť zrušiť iba obnovením továrenských nastavení, čím sa všetky údaje v tablete vymažú."\n\n"Šifrovanie môže trvať aj viac ako hodinu. V tablete musí byť pred šifrovaním nabitá batéria a po celú dobu šifrovania musí byť pripojený k zdroju napájania. Ak šifrovanie prerušíte, stratíte niektoré alebo všetky údaje."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Svoje účty, nastavenia, prevzaté aplikácie a ich údaje môžete šifrovať. Po zašifrovaní telefónu budete musieť pri každom zapnutí zadať číselný kód PIN alebo heslo a dešifrovať ho – toto šifrovanie budete môcť zrušiť iba obnovením továrenských nastavení, čím sa všetky údaje v telefóne vymažú."\n\n"Šifrovanie môže trvať aj viac ako hodinu. V telefóne musí byť pred šifrovaním nabitá batéria a po celú dobu šifrovania musí byť pripojený k zdroju napájania. Ak šifrovanie prerušíte, stratíte niektoré alebo všetky údaje."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Svoje účty, nastavenia, prevzaté aplikácie a ich údaje môžete šifrovať. Po zašifrovaní tabletu budete musieť pri každom zapnutí zadať číselný kód PIN alebo heslo a dešifrovať ho – toto šifrovanie budete môcť zrušiť iba obnovením továrenských nastavení, čím sa všetky údaje v tablete vymažú.\n\nŠifrovanie môže trvať aj viac ako hodinu. V tablete musí byť pred šifrovaním nabitá batéria a po celú dobu šifrovania musí byť pripojený k zdroju napájania. Ak šifrovanie prerušíte, stratíte niektoré alebo všetky údaje."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Svoje účty, nastavenia, prevzaté aplikácie a ich údaje môžete šifrovať. Po zašifrovaní telefónu budete musieť pri každom zapnutí zadať číselný kód PIN alebo heslo a dešifrovať ho – toto šifrovanie budete môcť zrušiť iba obnovením továrenských nastavení, čím sa všetky údaje v telefóne vymažú.\n\nŠifrovanie môže trvať aj viac ako hodinu. V telefóne musí byť pred šifrovaním nabitá batéria a po celú dobu šifrovania musí byť pripojený k zdroju napájania. Ak šifrovanie prerušíte, stratíte niektoré alebo všetky údaje."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifrovať tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifrovať telefón"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Nabite batériu a skúste to znova."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Počet sekúnd zostávajúcich do ďalšieho pokusu: <xliff:g id="DELAY">^1</xliff:g>."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Zadajte svoje heslo"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifrovanie bolo neúspešné"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifrovanie bolo prerušené a nedá sa dokončiť. Výsledkom je, že údaje vo vašom tablete už nie sú k dispozícii. "\n\n"Ak chcete ďalej používať svoj tablet, musíte obnoviť jeho továrenské nastavenia. Po ich obnovení budete mať počas nastavovania tabletu príležitosť obnoviť všetky údaje, ktoré sa zálohovali do vášho účtu Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifrovanie bolo prerušené a nedá sa dokončiť. Výsledkom je, že údaje vo vašom telefóne už nie sú k dispozícii. "\n\n"Ak chcete ďalej používať svoj telefón, musíte obnoviť jeho továrenské nastavenia. Po ich obnovení budete mať počas nastavovania telefónu príležitosť obnoviť všetky údaje, ktoré boli zálohované vo vašom účte Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifrovanie bolo prerušené a nedá sa dokončiť. Výsledkom je, že údaje vo vašom tablete už nie sú k dispozícii. \n\nAk chcete ďalej používať svoj tablet, musíte obnoviť jeho továrenské nastavenia. Po ich obnovení budete mať počas nastavovania tabletu príležitosť obnoviť všetky údaje, ktoré sa zálohovali do vášho účtu Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifrovanie bolo prerušené a nedá sa dokončiť. Výsledkom je, že údaje vo vašom telefóne už nie sú k dispozícii. \n\nAk chcete ďalej používať svoj telefón, musíte obnoviť jeho továrenské nastavenia. Po ich obnovení budete mať počas nastavovania telefónu príležitosť obnoviť všetky údaje, ktoré boli zálohované vo vašom účte Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Prepnúť metódu vstupu"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Zvoľte uzamk. obrazov."</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Vybrať zámku zálohy"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Prepája sa"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Pripojené"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"K dispozícii"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Používa sa"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Nastavenia obrazovky"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Odpojiť?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Táto akcia ukončí vaše pripojenie so zariadením:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Vyp."</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nedostupné, pretože je vypnutá technológia NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Ak je táto funkcia zapnutá a podržíte zariadenia blízko pri sebe, môžete odosielať obsah aplikácií do iného zariadenia s technológiou NFC. Napríklad môžete odosielať stránky prehliadača, videá YouTube, osobné kontakty a ďalšie."\n\n"Stačí priložiť zariadenia k sebe (obyčajne zadnými stranami) a potom sa dotknúť obrazovky. Aplikácia určí, aký obsah bude odoslaný."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Ak je táto funkcia zapnutá a podržíte zariadenia blízko pri sebe, môžete odosielať obsah aplikácií do iného zariadenia s technológiou NFC. Napríklad môžete odosielať stránky prehliadača, videá YouTube, osobné kontakty a ďalšie.\n\nStačí priložiť zariadenia k sebe (obyčajne zadnými stranami) a potom sa dotknúť obrazovky. Aplikácia určí, aký obsah bude odoslaný."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Vyhľadávanie sieťových služieb"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Povoliť aplikáciám v iných zariadeniach hľadať aplikácie v tomto zariadení"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zabezpečenie: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpečenie: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Žiadne"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnúť vyhľadávanie sietí (z dôvodu dosiahnutia vyššej presnosti určovania polohy aj z iných dôvodov) a hľadať siete aj v prípade, že je vypnutý modul Wi-Fi."\n\n"Chcete túto možnosť povoliť všetkým aplikáciám, ktoré chcú vyhľadávať siete?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnúť vyhľadávanie sietí (z dôvodu dosiahnutia vyššej presnosti určovania polohy aj z iných dôvodov) a hľadať siete aj v prípade, že je vypnutý modul Wi-Fi.\n\nChcete túto možnosť povoliť všetkým aplikáciám, ktoré chcú vyhľadávať siete?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Povoliť"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Odmietnuť"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Pripojiť"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"UPOZORNENIE: Operátor môže účtovať ďalšie poplatky za dáta.\n\nNastavenie tabletu môže vyžadovať prenos významného množstva dát."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"UPOZORNENIE: Operátor môže účtovať ďalšie poplatky za dáta.\n\nNastavenie telefónu môže vyžadovať prenos významného množstva dát."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"UPOZORNENIE: Tablet nebude môcť overiť aktuálnosť vášho softvéru, až kým nebudete mať pripojenie k internetu."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"UPOZORNENIE: Telefón nebude môcť overiť aktuálnosť vášho softvéru, až kým nebudete mať pripojenie k internetu."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet sa k tejto sieti Wi-Fi nedokázal pripojiť."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"Kód PIN karty SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Nesprávny kód PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Kódy PIN sa nezhodujú"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Kód PIN nie je možné zmeniť."\n"Kód PIN je zrejme nesprávny."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Kód PIN nie je možné zmeniť.\nKód PIN je zrejme nesprávny."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Kód PIN karty SIM bol zmenený."</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Stav zámku karty SIM nie je možné zmeniť."\n"Zrejme ste zadali nesprávny kód PIN."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Stav zámku karty SIM nie je možné zmeniť.\nZrejme ste zadali nesprávny kód PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Zrušiť"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stav tabletu"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Obnovenie továrenských nastavení"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Vymaže všetky údaje v tablete"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Vymaže všetky údaje v telefóne"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Táto operácia vymaže všetky údaje v "<b>"internom úložisku"</b>" tabletu, vrátane:"\n\n<li>"účtu Google,"</li>\n<li>"údajov a nastavení systému a aplikácií,"</li>\n<li>"prevzatých aplikácií"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Táto operácia vymaže všetky údaje v "<b>"internom úložisku"</b>" telefónu, vrátane:"\n\n<li>"účtu Google,"</li>\n<li>"údajov a nastavení systému a aplikácií,"</li>\n<li>"prevzatých aplikácií"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálne ste prihlásení do nasledujúcich účtov:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Táto operácia vymaže všetky údaje v "<b>"internom úložisku"</b>" tabletu, vrátane:\n\n"<li>"účtu Google,"</li>\n<li>"údajov a nastavení systému a aplikácií,"</li>\n<li>"prevzatých aplikácií"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Táto operácia vymaže všetky údaje v "<b>"internom úložisku"</b>" telefónu, vrátane:\n\n"<li>"účtu Google,"</li>\n<li>"údajov a nastavení systému a aplikácií,"</li>\n<li>"prevzatých aplikácií"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálne ste prihlásení do nasledujúcich účtov:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Hudba"</li>\n<li>"Fotografie"</li>\n<li>"Iné používateľské údaje"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ak chcete vymazať hudbu, obrázky a ďalšie používateľské údaje, musíte vymazať "<b>"úložisko USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Ak chcete vymazať hudbu, obrázky a ďalšie používateľské údaje, musíte vymazať "<b>"kartu SD"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Procesy vo vyrov. pamäti"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Obnoviť predvoľby aplik."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Obnoviť predvoľby aplik.?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Touto akciou obnovíte všetky predvoľby pre:"\n\n" "<li>"zakázané aplikácie,"</li>\n" "<li>"zakázané upozornenia aplikácií,"</li>\n" "<li>"predvolené aplikácie na vykonávanie akcií,"</li>\n" "<li>"obmedzenia údajov na pozadí pre aplikácie."</li>\n\n" O žiadne údaje aplikácií neprídete."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Touto akciou obnovíte všetky predvoľby pre:\n\n "<li>"zakázané aplikácie,"</li>\n" "<li>"zakázané upozornenia aplikácií,"</li>\n" "<li>"predvolené aplikácie na vykonávanie akcií,"</li>\n" "<li>"obmedzenia údajov na pozadí pre aplikácie."</li>\n\n" O žiadne údaje aplikácií neprídete."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Obnoviť aplikácie"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Správa pamäte"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrovať"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Prepnite klávesmi ctrl-space"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Predvolené"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Rozloženia klávesnice"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Používateľský slovník"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Osobný slovník"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Osobné slovníky"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Osobný slovník"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Pridať"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Pridať do slovníka"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"V hlavnej ponuke zahrnúť možnosť na vytvorenie správy o chybe"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Nezamykať obrazovku"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Obrazovka sa pri nabíjaní neprepne do režimu spánku"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Povoliť sledovací protokol Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zaznamenať všetky pakety Bluetooth HCI do súboru"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Výber času spustenia"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Výber času spustenia"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Chcete vykonať reštart a zmeniť čas spustenia z <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Povoliť simulované polohy"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Povoliť simulované polohy"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Povoliť ladenie USB?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Chrániť úložisko USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplikácie musia pred čítaním z úložiska USB žiadať povolenie"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Chrániť úložisko USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Keď je úložisko USB chránené, aplikácie musia pred čítaním údajov z externého úložiska požiadať o povolenie."\n\n"Pri niektorých aplikáciách platí, že budú fungovať až vtedy, keď ich vývojári aktualizujú."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Keď je úložisko USB chránené, aplikácie musia pred čítaním údajov z externého úložiska požiadať o povolenie.\n\nPri niektorých aplikáciách platí, že budú fungovať až vtedy, keď ich vývojári aktualizujú."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Chrániť kartu SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikácie musia pred čítaním z karty SD vyžiadať povolenie"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Chrániť kartu SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Keď je karta SD chránená, aplikácie musia pred čítaním údajov z externého úložiska požiadať o povolenie."\n\n"Pri niektorých aplikáciách platí, že budú fungovať až vtedy, keď ich vývojári aktualizujú."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Keď je karta SD chránená, aplikácie musia pred čítaním údajov z externého úložiska požiadať o povolenie.\n\nPri niektorých aplikáciách platí, že budú fungovať až vtedy, keď ich vývojári aktualizujú."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Miestny terminál"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Povoliť terminálovú apl. na miestny prístup k prostrediu shell"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Vyberte modul gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Vyberte miniaplikáciu"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Vytvoriť miniaplikáciu a povoliť prístup?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Služby"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Systém"</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_screen_magnification_summary" msgid="2380627654189671754">"Keď je táto funkcia zapnutá, môžete približovať alebo odďalovať trojitým klepnutím na obrazovku.\n\nPočas priblíženia môžete:\n"<ul><li>"Posúvať: Ťahajte dvoma alebo viacerými prstami po obrazovke."</li>\n<li>"Prispôsobiť úroveň priblíženia: Priblížte dva alebo viacero prstov k sebe alebo ich od seba odtiahnite."</li></ul>\n\n"Obsah pod prstom môžete tiež dočasne priblížiť trojitým klepnutím a podržaním. V stave priblíženia môžete posúvaním prsta preskúmavať rôzne časti obrazovky. Odtiahnutím prsta sa vrátite do predchádzajúceho stavu.\n\nPoznámka: Priblíženie trojitým klepnutím funguje všade okrem klávesnice a navigačného panela."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Skratka zjednodušeného ovládania"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Zapnuté"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Vypnuté"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Ak je táto funkcia zapnutá, môžete rýchlo v dvoch krokoch povoliť funkcie zjednodušenia ovládania:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Ak je táto funkcia zapnutá, môžete rýchlo v dvoch krokoch povoliť funkcie zjednodušenia ovládania:\n\nKrok 1: Stlačte tlačidlo zapnutia a podržte ho, dokým nezaznie zvukový signál alebo nezacítite vibrácie.\n\nKrok 2: Dotknite sa obrazovky dvoma prstami a podržte ju, dokým nezaznie zvuk potvrdenia.\n\nAk má zariadenie viacero používateľov, pomocou tejto skratky je možné na uzamknutej obrazovke dočasne povoliť zjednodušenie ovládania, dokým sa zariadenie neodomkne."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Veľké písmo"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Priblíženie obrazovky"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Auto. aktualiz. priblíž. obrazovky"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Aplikácia Talkback poskytuje hovorenú odozvu na pomoc nevidomým a slabozrakým používateľom. Chcete si túto aplikáciu bezplatne nainštalovať zo služby Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"K dispozícii nie je žiadny popis."</string>
     <string name="settings_button" msgid="3006713718908152930">"Nastavenia"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Tlač"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Nastavenia tlače"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Služby"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Použiť službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"Služba <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> môže prijímať dokumenty, ktoré tlačíte. Tieto dokumenty môžu obsahovať citlivé údaje."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Nie sú nainštalované žiadne služby"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Nastavenia"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Pridať tlačiarne"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Zapnuté"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Vypnuté"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batéria"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Čo využíva batériu"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Údaje o spotrebe nie sú k dispozícii."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Pripojenie Wi-Fi aktívne"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefón"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Odoslané údaje"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Prijaté údaje"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Odoslané mobilné dáta"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Prijaté mobilné dáta"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Dáta odoslané cez Wi-Fi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Dáta prijaté cez Wi-Fi"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Zvuk"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Doba zapnutia"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Výška"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Určuje zvuk hovoreného textu"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Jazyk"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nebol vybratý jazyk"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Nastavenia jazyka hlasu pre hovorený text"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Vypočuť príklad"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Prehrať krátku ukážku syntézy reči"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"Protokol EAP nie je podporovaný."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Počas inštalácie nie je možné konfigurovať pripojenie k sieti Wi-Fi cez protokol EAP. Po inštalácii to môžete vykonať v sekcii Nastavenia &gt; Bezdrôtové pripojenie a siete."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Pripájanie môže trvať niekoľko minút..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Ak chcete pokračovať v nastavovaní, dotknite sa možnosti "<b>"Ďalej"</b>"."\n\n"Ak sa chcete pripojiť k inej sieti Wi-Fi, dotknite sa možnosti "<b>"Späť"</b>"."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Ak chcete pokračovať v nastavovaní, dotknite sa možnosti "<b>"Ďalej"</b>".\n\nAk sa chcete pripojiť k inej sieti Wi-Fi, dotknite sa možnosti "<b>"Späť"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronizácia je povolená"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronizácia bola zakázaná"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Chyba synchronizácie"</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalendár"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Kontakty"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Víta vás služba Google Sync"</font>" "\n"Spoločnosť Google pomocou nej synchronizuje údaje a umožňuje vám tak pristupovať ku kontaktom, stretnutiam a ďalším informáciám, nech ste kdekoľvek."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Víta vás služba Google Sync"</font>" \nSpoločnosť Google pomocou nej synchronizuje údaje a umožňuje vám tak pristupovať ku kontaktom, stretnutiam a ďalším informáciám, nech ste kdekoľvek."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Nastavenia synchronizácie aplikácie"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Údaje a synchronizácia"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Zmeniť heslo"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Ladenie prekresľovania GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Zakázať hardvér. prekrytia"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Vždy používať jednotku GPU na skladanie obrazovky"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Povoliť trasovanie OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Zakázať údaje na pozadí v mob. sieťach. Použiť iné ako mob. siete, ak sú k disp."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Nastav. dát. limitu mob. siete obmedzíte údaje na poz. pre apl."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Obmedziť údaje na pozadí?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ak budú k dispozícii len mobilné siete, môže táto funkcia spôsobiť, že aplikácie, ktoré údaje na pozadí vyžadujú, nebudú fungovať."\n\n"Vhodnejšie spôsoby ovládania využívania údajov nájdete v nastaveniach aplikácie."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ak budú k dispozícii len mobilné siete, môže táto funkcia spôsobiť, že aplikácie, ktoré údaje na pozadí vyžadujú, nebudú fungovať.\n\nVhodnejšie spôsoby ovládania využívania údajov nájdete v nastaveniach aplikácie."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Obmedzenie údajov na pozadí je možné len v prípade, že ste nastavili dátový limit pre mobilnú sieť."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Zapnúť automat. synchr. údajov?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Všetky zmeny vykonané v rámci vašich účtov na webe sa automaticky skopírujú do vášho tabletu."\n\n"Niektoré účty môžu tiež automaticky skopírovať na web akékoľvek zmeny vykonané v tablete. Týmto spôsobom funguje aj účet Google."\n\n"Typy informácií, ktoré sa budú v jednotlivých účtoch synchronizovať, môžete nastaviť v sekcii Nastavenia &gt; Účty."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Všetky zmeny vykonané v rámci vašich účtov na webe sa automaticky skopírujú do vášho telefónu."\n\n"Niektoré účty môžu tiež automaticky skopírovať na web akékoľvek zmeny vykonané v telefóne. Týmto spôsobom funguje aj účet Google."\n\n"Typy informácií, ktoré sa budú v jednotlivých účtoch synchronizovať, môžete nastaviť v sekcii Nastavenia &gt; Účty."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Všetky zmeny vykonané v rámci vašich účtov na webe sa automaticky skopírujú do vášho tabletu.\n\nNiektoré účty môžu tiež automaticky skopírovať na web akékoľvek zmeny vykonané v tablete. Týmto spôsobom funguje aj účet Google.\n\nTypy informácií, ktoré sa budú v jednotlivých účtoch synchronizovať, môžete nastaviť v sekcii Nastavenia &gt; Účty."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Všetky zmeny vykonané v rámci vašich účtov na webe sa automaticky skopírujú do vášho telefónu.\n\nNiektoré účty môžu tiež automaticky skopírovať na web akékoľvek zmeny vykonané v telefóne. Týmto spôsobom funguje aj účet Google.\n\nTypy informácií, ktoré sa budú v jednotlivých účtoch synchronizovať, môžete nastaviť v sekcii Nastavenia &gt; Účty."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Vypnúť automat. synchr. údajov?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Toto nastavenie šetrí spotrebu dát a batérie. Na získanie najnovších informácií však budete musieť každý účet synchronizovať ručne. Nebudete tiež dostávať upozornenia na dostupné aktualizácie."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Dátum obnovenia cyklu sledovania prenesených dát"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Nastaviť upozornenie o využívaní údajov"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Nastaviť limit využívania údajov"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Nastavuje sa obmedzenie dátových prenosov"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Po dosiahnutí stanoveného limitu bude vaše mobilné dátové pripojenie zakázané."\n\n"Keďže sa využitie dát meria pomocou vášho tabletu a operátor môže využitie dát účtovať inak, zvážte nastavenie nižšieho limitu."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Po dosiahnutí stanoveného limitu bude vaše mobilné dátové pripojenie zakázané."\n\n"Keďže sa využitie dát meria pomocou vášho telefónu a operátor môže využitie dát účtovať inak, zvážte nastavenie nižšieho limitu."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Po dosiahnutí stanoveného limitu bude vaše mobilné dátové pripojenie zakázané.\n\nKeďže sa využitie dát meria pomocou vášho tabletu a operátor môže využitie dát účtovať inak, zvážte nastavenie nižšieho limitu."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Po dosiahnutí stanoveného limitu bude vaše mobilné dátové pripojenie zakázané.\n\nKeďže sa využitie dát meria pomocou vášho telefónu a operátor môže využitie dát účtovať inak, zvážte nastavenie nižšieho limitu."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Obmedziť údaje na pozadí?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Ak obmedzíte mobilné dáta na pozadí, niektoré aplikácie a služby nebudú fungovať, dokým sa nepripojíte k sieti Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ak obmedzíte mobilné dáta na pozadí, niektoré aplikácie a služby nebudú fungovať, dokým sa nepripojíte k sieti Wi-Fi."\n\n"Toto nastavenie ovplyvní všetkých používateľov tohto tabletu."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ak obmedzíte mobilné dáta na pozadí, niektoré aplikácie a služby nebudú fungovať, dokým sa nepripojíte k sieti Wi-Fi."\n\n"Toto nastavenie ovplyvní všetkých používateľov tohto telefónu."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ak obmedzíte mobilné dáta na pozadí, niektoré aplikácie a služby nebudú fungovať, dokým sa nepripojíte k sieti Wi-Fi.\n\nToto nastavenie ovplyvní všetkých používateľov tohto tabletu."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ak obmedzíte mobilné dáta na pozadí, niektoré aplikácie a služby nebudú fungovať, dokým sa nepripojíte k sieti Wi-Fi.\n\nToto nastavenie ovplyvní všetkých používateľov tohto telefónu."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"upozornenie"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="12">"limit:"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Odstránené aplikácie"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Používateľ"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Obmedzený profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Pridať nového používateľa"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Toto zariadenie môžete zdieľať aj s inými ľuďmi. Stačí vytvoriť ďalších používateľov. Každý používateľ má svoj vlastný priestor, ktorý si môže prispôsobiť pomocou aplikácií, tapety a pod. Používatelia si môžu prispôsobiť aj nastavenia tabletu, ktoré majú vplyv na ostatných (napr. nastavenia siete Wi-Fi)."\n\n"Keď vytvoríte nového používateľa, táto osoba musí prejsť procesom nastavenia."\n\n"Každý používateľ môže akceptovať aktualizované povolenia aplikácií v mene všetkých ostatných používateľov."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"Keď vytvoríte nového používateľa, táto osoba musí prejsť procesom nastavenia."\n\n"Ktorýkoľvek používateľ môže akceptovať aktualizované povolenia aplikácií v mene všetkých ostatných používateľov."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Toto zariadenie môžete zdieľať aj s inými ľuďmi. Stačí vytvoriť ďalších používateľov. Každý používateľ má svoj vlastný priestor, ktorý si môže prispôsobiť pomocou aplikácií, tapety a pod. Používatelia si môžu prispôsobiť aj nastavenia tabletu, ktoré majú vplyv na ostatných (napr. nastavenia siete Wi-Fi).\n\nKeď vytvoríte nového používateľa, táto osoba musí prejsť procesom nastavenia.\n\nKaždý používateľ môže akceptovať aktualizované povolenia aplikácií v mene všetkých ostatných používateľov."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Keď vytvoríte nového používateľa, táto osoba musí prejsť procesom nastavenia.\n\nKtorýkoľvek používateľ môže akceptovať aktualizované povolenia aplikácií v mene všetkých ostatných používateľov."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Chcete teraz nastaviť používateľa?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Uistite sa, že je príslušná osoba k dispozícii, aby mohla na tablete nastaviť svoj priestor"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Nastaviť profil?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Toto nastavenie ovplyvní všetkých používateľov tohto telefónu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Zmeniť jazyk"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Zmeniť veľkosť písma"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Obmedzenia"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Odstrániť obmedzenia"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Zmeniť kód PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Zobraziť upozornenia"</string>
     <string name="help_label" msgid="1107174367904110532">"Pomocník"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Účet pre obsah"</string>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index d31eb740573..5e4c4977d50 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Lokacija"</item>
     <item msgid="255608127647030286">"Osebno"</item>
     <item msgid="4588829735729884491">"Sporočila"</item>
-    <item msgid="8971765125227378270">"Naprava"</item>
+    <item msgid="886742181977884584">"Predstavnosti"</item>
+    <item msgid="7924928667052300589">"Naprava"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"groba lokacija"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"predvajanje zvoka"</item>
     <item msgid="8374996688066472414">"preberi odložišče"</item>
     <item msgid="3045529469061083747">"spremeni odložišče"</item>
+    <item msgid="5124443975763747838">"gumbi za predstavnosti"</item>
+    <item msgid="4547883971364273343">"fokus zvoka"</item>
+    <item msgid="2603878814882344450">"glavna glasnost"</item>
+    <item msgid="7136963238377062018">"glasnost glasu"</item>
+    <item msgid="4270236897655923007">"glasnost zvonjenja"</item>
+    <item msgid="6325739889222559394">"glasnost predstavnosti"</item>
+    <item msgid="5762123934816216821">"glasnost alarma"</item>
+    <item msgid="785049718065337473">"glasnost obvestila"</item>
+    <item msgid="6700305533746877052">"glasnost za Bluetooth"</item>
+    <item msgid="2029227495214047094">"ohrani odklenjen zaslon"</item>
+    <item msgid="26109888160231211">"spremljanje lokacije"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokacija"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Predvajanje zvoka"</item>
     <item msgid="136815868796597058">"Preberi odložišče"</item>
     <item msgid="5238692940326972503">"Spremeni odložišče"</item>
+    <item msgid="5753789168376302997">"Gumbi za predstavnosti"</item>
+    <item msgid="3265262911688671938">"Osredotočenost zvoka"</item>
+    <item msgid="2098976479485046797">"Glavna glasnost"</item>
+    <item msgid="5660213838861789350">"Glasnost glasu"</item>
+    <item msgid="7983336752371254444">"Glasnost zvonjenja"</item>
+    <item msgid="7878027809189330917">"Glasnost predstavnosti"</item>
+    <item msgid="7260546305036218513">"Glasnost alarma"</item>
+    <item msgid="9103719301075748925">"Glasnost obvestila"</item>
+    <item msgid="7025966722295861512">"Glasnost Bluetootha"</item>
+    <item msgid="4665183401128289653">"Ohrani odklenjen zaslon"</item>
+    <item msgid="8584357129746649222">"Lokacija"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kratko"</item>
     <item msgid="2560532955514699713">"Srednja"</item>
     <item msgid="2372711992605524591">"Dolgo"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (iskanje napak)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Uporabi Dalvik"</item>
+    <item msgid="5131846588686178907">"Uporabi ART"</item>
+    <item msgid="4530003713865319928">"Uporabi različico za iskanje napak ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Nikoli ne preveri"</item>
     <item msgid="6042769699089883931">"Preveri samo glede vsebine DRM"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Na zaslonu kot črte"</item>
     <item msgid="120512413928262547">"V gfxinfo dumpsys lupine adb"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Izklop"</item>
+    <item msgid="7688197031296835369">"Risanje zunaj vidnega območja"</item>
+    <item msgid="8332661909019981149">"Števec risanja zunaj vidn. območja"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardna omejitev"</item>
     <item msgid="4071574792028999443">"Ni postopkov v ozadju"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c34d0dd9476..d3c1bde7a76 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Če omogočite podatkovno gostovanje, si lahko naprtite velike stroške!\n\nNastavitev vpliva na vse uporabnike v tem tabličnem računalniku."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Če omogočite podatkovno gostovanje, si lahko naprtite velike stroške!\n\nNastavitev vpliva na vse uporabnike v tem telefonu."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Želite dovoliti podatkovno gostovanje?"</string>
     <string name="networks" msgid="6333316876545927039">"Izbira operaterja"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Izbira omrežnega operaterja"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Zahteva kodo PIN ali geslo, s katerim boste ob vsakem vklopu dešifrirali tablični računalnik"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Zahteva kodo PIN ali geslo, s katerim boste ob vsakem vklopu dešifrirali telefon"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrirano"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Šifrirate lahko račune, nastavitve, prenesene programe in njihove podatkovne, predstavnostne in druge datoteke. Če šifrirate tablični računalnik, ga morate ob vsakem vklopu dešifrirati z vpisom številske kode PIN ali gesla, sicer ga lahko dešifrirate samo tako, da ga ponastavite na tovarniške nastavitve, pri čemer izbrišete vse podatke."\n\n"Šifriranje traja uro ali več. Začeti morate z napolnjeno baterijo, računalnik pa mora biti do konca postopka priključen v električno omrežje. Če postopek prekinete, boste izgubili nekatere ali vse podatke."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Šifrirate lahko račune, nastavitve, prenesene programe in njihove podatkovne, predstavnostne in druge datoteke. Če šifrirate telefon, ga morate ob vsakem vklopu dešifrirati z vpisom številske kode PIN ali gesla, sicer ga lahko dešifrirate samo tako, da ga ponastavite na tovarniške nastavitve, pri čemer izbrišete vse podatke."\n\n"Šifriranje traja uro ali več. Začeti morate z napolnjeno baterijo, telefon pa mora biti do konca postopka priključen v električno omrežje. Če postopek prekinete, boste izgubili nekatere ali vse podatke."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Šifrirate lahko račune, nastavitve, prenesene programe in njihove podatkovne, predstavnostne in druge datoteke. Če šifrirate tablični računalnik, ga morate ob vsakem vklopu dešifrirati z vpisom številske kode PIN ali gesla, sicer ga lahko dešifrirate samo tako, da ga ponastavite na tovarniške nastavitve, pri čemer izbrišete vse podatke.\n\nŠifriranje traja uro ali več. Začeti morate z napolnjeno baterijo, računalnik pa mora biti do konca postopka priključen v električno omrežje. Če postopek prekinete, boste izgubili nekatere ali vse podatke."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Šifrirate lahko račune, nastavitve, prenesene programe in njihove podatkovne, predstavnostne in druge datoteke. Če šifrirate telefon, ga morate ob vsakem vklopu dešifrirati z vpisom številske kode PIN ali gesla, sicer ga lahko dešifrirate samo tako, da ga ponastavite na tovarniške nastavitve, pri čemer izbrišete vse podatke.\n\nŠifriranje traja uro ali več. Začeti morate z napolnjeno baterijo, telefon pa mora biti do konca postopka priključen v električno omrežje. Če postopek prekinete, boste izgubili nekatere ali vse podatke."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifriraj tablični računalnik"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifriraj telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Napolnite baterijo in poskusite znova."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Poskusite znova čez <xliff:g id="DELAY">^1</xliff:g> sekund."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Vnesite geslo"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifriranje ni uspelo"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v tabličnem računalniku niso več dostopni. "\n\n"Če želite tablični računalnik spet uporabljati, ga morate ponastaviti na tovarniške nastavitve. Ko ga po ponastavitvi spet nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v Google Račun."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v telefonu niso več dostopni. "\n\n"Če želite telefon ponovno uporabljati, ga morate ponastaviti na tovarniške nastavitve. Ko ga po ponastavitvi ponovno nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v Google Račun."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v tabličnem računalniku niso več dostopni. \n\nČe želite tablični računalnik spet uporabljati, ga morate ponastaviti na tovarniške nastavitve. Ko ga po ponastavitvi spet nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v Google Račun."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Šifriranje je bilo prekinjeno in ga ni mogoče končati, zato podatki v telefonu niso več dostopni. \n\nČe želite telefon ponovno uporabljati, ga morate ponastaviti na tovarniške nastavitve. Ko ga po ponastavitvi ponovno nastavite, boste lahko obnovili vse podatke, ki so bili varnostno kopirani v Google Račun."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Preklopite način vnosa"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Izberite zakl. zaslona"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Izberite varnostno zaklepanje"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Povezovanje"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Povezane"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Na voljo"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"V uporabi"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Nastavitve naprave"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Želite prekiniti povezavo?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"S tem bo prekinjena povezava z napravo:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Izklopljeno"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Ni na voljo, ker je NFC izklopljen"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Če je ta funkcija vklopljena, lahko vsebino iz programa prenesete v drugo napravo, ki podpira NFC, tako da napravi približate. Prenesete lahko na primer strani brskalnika, videoposnetke v YouTubu, stike iz programa Ljudje in drugo."\n\n"Približajte napravi (običajno s hrbtno stranjo) in se dotaknite zaslona. Kaj se prenese, je odvisno od programa."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Če je ta funkcija vklopljena, lahko vsebino iz programa prenesete v drugo napravo, ki podpira NFC, tako da napravi približate. Prenesete lahko na primer strani brskalnika, videoposnetke v YouTubu, stike iz programa Ljudje in drugo.\n\nPribližajte napravi (običajno s hrbtno stranjo) in se dotaknite zaslona. Kaj se prenese, je odvisno od programa."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Odkrivanje omrežnih storitev"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Dovoli, da aplikacije v drugih napravah odkrivajo aplikacije v tej napravi"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zaščiteno z <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zaščiteno z <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Brez"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Za izboljšanje natančnosti lokacijskih podatkov in druge namene želi <xliff:g id="APP_NAME">%1$s</xliff:g> vklopiti iskanje omrežij, tudi ko je Wi-Fi izklopljen."\n\n"Želite to dovoliti vsem aplikacijam, ki želijo iskati omrežja?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Za izboljšanje natančnosti lokacijskih podatkov in druge namene želi <xliff:g id="APP_NAME">%1$s</xliff:g> vklopiti iskanje omrežij, tudi ko je Wi-Fi izklopljen.\n\nŽelite to dovoliti vsem aplikacijam, ki želijo iskati omrežja?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Dovoli"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Zavrni"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Vzpostavi povezavo"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"OPOZORILO: Operater vam lahko zaračuna dodatne stroške.\n\nNastavitev tabličnega računalnika lahko zahteva znatno omrežno dejavnost."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"OPOZORILO: Operater vam lahko zaračuna dodatne stroške.\n\nNastavitev telefona lahko zahteva znatno omrežno dejavnost."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"OPOZORILO: Dokler nimate internetne povezave, tablični računalnik ne more preveriti, ali je programska oprema posodobljena."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"OPOZORILO: Dokler nimate internetne povezave, telefon ne more preveriti, ali je programska oprema posodobljena."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablični računalnik se ni mogel povezati v to omrežje Wi-Fi."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"Koda PIN za kartico SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Napačen PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Kodi PIN se ne ujemata"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Kode PIN ni mogoče spremeniti."\n"Koda PIN je morda napačna."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Kode PIN ni mogoče spremeniti.\nKoda PIN je morda napačna."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Sprememba kode PIN za kartico SIM je uspela"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Zaklepanja kartice SIM ni mogoče spremeniti."\n"Morda je koda PIN napačna."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Zaklepanja kartice SIM ni mogoče spremeniti.\nMorda je koda PIN napačna."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"V redu"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Prekliči"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Stanje tabličnega računalnika"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Ponastavitev na tovarniške nastavitve"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Izbriše vse podatke na tabličnem računalniku"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Izbriše vse podatke iz telefona"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"S tem boste iz "<b>"notranjega pomnilnika"</b>" tabličnega računalnika izbrisali vse podatke:"\n\n<li>"Google Račun"</li>\n<li>"Podatke in nastavitve sistema in programov"</li>\n<li>"Prenesene programe"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"S tem boste iz "<b>"notranjega pomnilnika"</b>" telefona izbrisali vse podatke:"\n\n<li>"Google Račun"</li>\n<li>"Podatke in nastavitve sistema in programov"</li>\n<li>"Prenesene programe"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutno ste prijavljeni v te račune:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"S tem boste iz "<b>"notranjega pomnilnika"</b>" tabličnega računalnika izbrisali vse podatke:\n\n"<li>"Google Račun"</li>\n<li>"Podatke in nastavitve sistema in programov"</li>\n<li>"Prenesene programe"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"S tem boste iz "<b>"notranjega pomnilnika"</b>" telefona izbrisali vse podatke:\n\n"<li>"Google Račun"</li>\n<li>"Podatke in nastavitve sistema in programov"</li>\n<li>"Prenesene programe"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutno ste prijavljeni v te račune:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Glasba"</li>\n<li>"Fotografije"</li>\n<li>"Drugi uporabniški podatki"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Če želite izbrisati glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"pomnilnik USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Če želite izbrisati glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"kartico SD"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Pokaži predpom. procese"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Ponast. nast. aplikacije"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Ponastavitev nastavitev?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ponastavili boste vse nastavitve za:"\n\n" "<li>"Onemogočene aplikacije"</li>\n" "<li>"Obvestila o onemogočenih aplikacijah"</li>\n" "<li>"Privzete aplikacije za dejanja"</li>\n" "<li>"Omejitve podatkov v ozadju za aplikacije"</li>\n\n" Podatkov aplikacij ne boste izgubili."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ponastavili boste vse nastavitve za:\n\n "<li>"Onemogočene aplikacije"</li>\n" "<li>"Obvestila o onemogočenih aplikacijah"</li>\n" "<li>"Privzete aplikacije za dejanja"</li>\n" "<li>"Omejitve podatkov v ozadju za aplikacije"</li>\n\n" Podatkov aplikacij ne boste izgubili."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Ponastavitev aplikacij"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostor"</string>
     <string name="filter" msgid="2018011724373033887">"Filtriraj"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Preklopite s Ctrl + preslednica"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Privzeto"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Razporeditve tipkovnice"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Uporabniški slovar"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Osebni slovar"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Osebni slovarji"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Osebni slovar"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Dodaj"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Dodaj v slovar"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Vključitev možnosti za poročila o napakah v meniju z možnostmi izklop/vklop"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Brez zaklepanja"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Med polnjenjem se zaslon ne bo nikoli zaklenil"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Omogoči dnevnik vohljanja Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zajemi vse pakete Bluetooth HCI v datoteko"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Izbira izvajalnika"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Izbira izvajalnika"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Želite napravo znova zagnati, da se različica izvajalnika spremeni z <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Dovoli lažne lokacije"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Dovoli lažne lokacije"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Ali dovolite odpravljanje težav s povezavo USB?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Zaščiti shrambo USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplikacije morajo zahtevati dovoljenje za branje shrambe USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Želite zaščititi shrambo USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Če je shramba USB zaščitena, morajo aplikacije zahtevati dovoljenje za branje podatkov iz zunanje shrambe."\n\n"Nekatere aplikacije morda ne bodo delovale, dokler jih njihovi razvijalci ne posodobijo."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Če je shramba USB zaščitena, morajo aplikacije zahtevati dovoljenje za branje podatkov iz zunanje shrambe.\n\nNekatere aplikacije morda ne bodo delovale, dokler jih njihovi razvijalci ne posodobijo."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Zaščiti kartico SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Aplikacije morajo zahtevati dovoljenje za branje kartice SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Želite zaščititi kartico SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Če je kartica SD zaščitena, morajo aplikacije zahtevati dovoljenje za branje podatkov iz zunanje shrambe."\n\n"Nekatere aplikacije morda ne bodo delovale, dokler jih njihovi razvijalci ne posodobijo."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Če je kartica SD zaščitena, morajo aplikacije zahtevati dovoljenje za branje podatkov iz zunanje shrambe.\n\nNekatere aplikacije morda ne bodo delovale, dokler jih njihovi razvijalci ne posodobijo."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokalni terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Omogočanje terminalske aplikacije za dostop do lokalne lupine"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Izberi pripomoček"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Izberite pripomoček"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Želite ustvariti pripomoček in dovoliti dostop?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Storitve"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</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_screen_magnification_summary" msgid="2380627654189671754">"Če je ta funkcija vklopljena, lahko vsebino na zaslonu povečate ali pomanjšate tako, da se trikrat dotaknete zaslona.\n\nPri povečavi lahko:\n"<ul><li>"Pomikate vsebino na zaslonu: Dva prsta ali več povlecite po zaslonu."</li>\n<li>"Prilagodite stopnjo povečave/pomanjšave: Najmanj dva prsta približajte ali razširite."</li></ul>\n\n"Začasno lahko tisto, kar je pod vašim prstom, povečate tudi tako, da se zaslona trikrat dotaknete in ga pridržite. V tem načinu povečave lahko povlečete s prstom in raziščete različne dele zaslona. Dvignite prst, če se želite vrniti v prejšnje stanje.\n\nOpomba: Trojni dotik za povečavo deluje povsod, razen pri tipkovnici in v vrstici za krmarjenje"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Bližnj. prip. za ljudi s pos. pot."</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Vklopljeno"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Izklopljeno"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Če je ta funkcija vklopljena, lahko v dveh korakih hitro omogočite funkcije za ljudi s posebnimi potrebami:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Če je ta funkcija vklopljena, lahko v dveh korakih hitro omogočite funkcije za ljudi s posebnimi potrebami:\n\n1. korak: Pritisnite in pridržite gumb za vklop, dokler ne zaslišite zvoka ali začutite vibracije.\n\n2. korak: Dotaknite se zaslona z dvema prstoma in pridržite, dokler ne zaslišite zvočne potrditve.\n\nČe napravo uporablja več uporabnikov, z uporabo te bližnjice na zaslonu za zaklepanje začasno omogočite funkcije za ljudi s posebnimi potrebami, dokler naprave ne odklenete."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Veliko besedilo"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Povečava zaslona"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Samodejno posodobi povečavo zaslona"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Program TalkBack daje izgovorjene povratne informacije za pomoč slepim in slabovidnim uporabnikom. Ali ga želite brezplačno namestiti iz trgovine Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ni opisa."</string>
     <string name="settings_button" msgid="3006713718908152930">"Nastavitve"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Tiskanje"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Nastavitve tiskanja"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Storitve"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Želite uporabiti storitev <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"Storitev <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> lahko prejema dokumente, ki jih natisnete. Ti dokumenti lahko vsebujejo občutljive podatke."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Nameščena ni nobena storitev"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Nastavitve"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Dodajanje tiskalnikov"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Vklop"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Izklop"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterija"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Kaj porablja energijo baterije"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Podatki o porabi baterije niso na voljo."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi vklopljen"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablični računalnik"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Poslani podatki"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Podatki prejeti"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Podatki, poslani v mobilnih omr."</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Podatki, prejeti v mobilnih omr."</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Podatki, poslani v omr. Wi-Fi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Podatki, prejeti v omr. Wi-Fi"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Zvok"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Čas vklopa"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Višina tona"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Vpliva na ton govorjenega besedila"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Jezik"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Jezik ni izbran"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Nastavite glas, odvisen od jezika, za govorjeno besedilo"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Poslušaj primer"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Predvajaj kratko predstavitev sinteze govora"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP ni podprt."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Povezave EAP Wi-Fi ne morete nastaviti med namestitvijo. To lahko po namestitvi naredite v Nastavitve &gt; Brezžično in omrežja."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Vzpostavljanje povezave lahko traja nekaj minut ..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Če želite nadaljevati namestitev, se dotaknite "<b>"Naprej"</b>"."\n\n"Če se želite povezati z drugim omrežjem Wi-Fi, se dotaknite "<b>"Nazaj"</b>"."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Če želite nadaljevati namestitev, se dotaknite "<b>"Naprej"</b>".\n\nČe se želite povezati z drugim omrežjem Wi-Fi, se dotaknite "<b>"Nazaj"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinhronizacija omogočena"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinhronizacija onemogočena"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Napaka pri sinhronizaciji"</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Koledar"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Stiki"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Pozdravljeni v storitvi Google Sync."</font>" "\n"Googlov pristop k sinhroniziranju podatkov, s katerim lahko dostopate do stikov, koledarskih vnosov in drugih podatkov ne glede na to, kje ste."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Pozdravljeni v storitvi Google Sync."</font>" \nGooglov pristop k sinhroniziranju podatkov, s katerim lahko dostopate do stikov, koledarskih vnosov in drugih podatkov ne glede na to, kje ste."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Nastavitve sinhronizacije programov"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Podatki in sinhronizacija"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Spremeni geslo"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Odpr. nap. ris. zunaj vidn. obm. za GPE"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Onem. strojni medp."</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Za sestavljanje slike vedno uporabi graf. procesor"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Omogoči sledi OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Onem. prenos podat. v ozadju v mob. omr. Upor. bodo nemob. omr."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Če želite za ta program omejiti prenos podatkov v ozadju, nastavite omejitev prenosa podatkov v mobilnih omrežjih."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Želite omejiti podatke v ozadju?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ta funkcija lahko povzroči prenehanje delovanja aplikacije, ki je odvisna od podatkov v ozadju, če so na voljo samo mobilna omrežja."\n\n"Ustreznejši kontrolniki za uporabo podatkov so na voljo v nastavitvah v aplikaciji."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ta funkcija lahko povzroči prenehanje delovanja aplikacije, ki je odvisna od podatkov v ozadju, če so na voljo samo mobilna omrežja.\n\nUstreznejši kontrolniki za uporabo podatkov so na voljo v nastavitvah v aplikaciji."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Prenos podatkov v ozadju lahko omejite samo, če nastavite omejitev količine podatkov, prenesenih v mobilnih omrežjih."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Želite vklopiti samodejno sinhroniziranje podatkov?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Vse spremembe vaših računov v spletu bodo samodejno kopirane v tablični računalnik."\n\n"Nekateri računi lahko spremembe, narejene v tabličnem računalniku, samodejno kopirajo v splet. Na ta način deluje Google Račun."\n\n"Če želite izbrati, katere vrste podatkov sinhronizirati v katerem računu, pojdite na Nastavitve &gt; Računi."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Vse spremembe vaših računov v spletu bodo samodejno kopirane v telefon."\n\n"Nekateri računi lahko spremembe, narejene v telefonu, samodejno kopirajo v splet. Na ta način deluje Google Račun."\n\n"Če želite izbrati, katere vrste podatkov sinhronizirati v katerem računu, pojdite na Nastavitve &gt; Računi."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Vse spremembe vaših računov v spletu bodo samodejno kopirane v tablični računalnik.\n\nNekateri računi lahko spremembe, narejene v tabličnem računalniku, samodejno kopirajo v splet. Na ta način deluje Google Račun.\n\nČe želite izbrati, katere vrste podatkov sinhronizirati v katerem računu, pojdite na Nastavitve &gt; Računi."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Vse spremembe vaših računov v spletu bodo samodejno kopirane v telefon.\n\nNekateri računi lahko spremembe, narejene v telefonu, samodejno kopirajo v splet. Na ta način deluje Google Račun.\n\nČe želite izbrati, katere vrste podatkov sinhronizirati v katerem računu, pojdite na Nastavitve &gt; Računi."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Želite izklopiti samodejno sinhroniziranje podatkov?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"S tem zmanjšate količino prenesenih podatkov in porabo akumulatorja, vendar boste morali vsak posamezen račun sinhronizirati ročno, da dobite najnovejše podatke. Prav tako ne boste dobili obvestil o posodobitvah."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum ponastavitve cikla porabe"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Nastavi opozorilo o uporabi podatkov"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Nastavitev omejitve količine prenesenih podatkov"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Omejitev porabe podatkov"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Vaša mobilna podatkovna povezava bo onemogočena, ko dosežete omejitev."\n\n"Ker uporabo podatkov meri tablični računalnik, operater pa jo lahko obračunava drugače, priporočamo, da uporabite nekoliko manjšo omejitev."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Vaša mobilna podatkovna povezava bo onemogočena, ko dosežete omejitev."\n\n"Ker uporabo podatkov meri telefon, operater pa jo lahko obračunava drugače, priporočamo, da uporabite nekoliko manjšo omejitev."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Vaša mobilna podatkovna povezava bo onemogočena, ko dosežete omejitev.\n\nKer uporabo podatkov meri tablični računalnik, operater pa jo lahko obračunava drugače, priporočamo, da uporabite nekoliko manjšo omejitev."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Vaša mobilna podatkovna povezava bo onemogočena, ko dosežete omejitev.\n\nKer uporabo podatkov meri telefon, operater pa jo lahko obračunava drugače, priporočamo, da uporabite nekoliko manjšo omejitev."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Želite omejiti podatke v ozadju?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Če omejite podatkovni prenos v mobilnih omrežjih v ozadju, nekatere aplikacije in storitve ne bodo delovale, kadar niste povezani v omrežje Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Če omejite podatkovni prenos v mobilnih omrežjih v ozadju, nekatere aplikacije in storitve ne bodo delovale, kadar niste povezani v omrežje Wi-Fi."\n\n"Nastavitev vpliva na vse uporabnike tega tabličnega računalnika."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Če omejite podatkovni prenos v mobilnih omrežjih v ozadju, nekatere aplikacije in storitve ne bodo delovale, kadar niste povezani v omrežje Wi-Fi."\n\n"Nastavitev vpliva na vse uporabnike tega telefona."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Če omejite podatkovni prenos v mobilnih omrežjih v ozadju, nekatere aplikacije in storitve ne bodo delovale, kadar niste povezani v omrežje Wi-Fi.\n\nNastavitev vpliva na vse uporabnike tega tabličnega računalnika."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Če omejite podatkovni prenos v mobilnih omrežjih v ozadju, nekatere aplikacije in storitve ne bodo delovale, kadar niste povezani v omrežje Wi-Fi.\n\nNastavitev vpliva na vse uporabnike tega telefona."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">" <xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"opozorilo"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"omejitev"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Odstranjeni programi"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Uporabnik"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Omejen profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Dodaj novega uporabnika"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"To napravo lahko delite z drugimi, pred tem pa morate ustvariti dodatne uporabnike. Vsak uporabnik ima svoj prostor, ki ga lahko prilagaja z dodajanjem aplikacij, ozadij in drugih elementov. Uporabniki lahko poleg tega prilagajajo nastavitve tabličnega računalnika, ki vplivajo tudi na druge uporabnike, na primer Wi-Fi."\n\n"Ko ustvarite novega uporabnika, mora ta oseba opraviti postopek namestitve."\n\n"Vsak uporabnik lahko sprejme posodobljena dovoljenja za aplikacije v imenu vseh drugih uporabnikov."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"Ko ustvarite novega uporabnika, mora slednji opraviti postopek namestitve."\n\n"Vsak uporabnik lahko sprejme nova dovoljenja za aplikacije v imenu vseh ostalih uporabnikov."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"To napravo lahko delite z drugimi, pred tem pa morate ustvariti dodatne uporabnike. Vsak uporabnik ima svoj prostor, ki ga lahko prilagaja z dodajanjem aplikacij, ozadij in drugih elementov. Uporabniki lahko poleg tega prilagajajo nastavitve tabličnega računalnika, ki vplivajo tudi na druge uporabnike, na primer Wi-Fi.\n\nKo ustvarite novega uporabnika, mora ta oseba opraviti postopek namestitve.\n\nVsak uporabnik lahko sprejme posodobljena dovoljenja za aplikacije v imenu vseh drugih uporabnikov."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Ko ustvarite novega uporabnika, mora slednji opraviti postopek namestitve.\n\nVsak uporabnik lahko sprejme nova dovoljenja za aplikacije v imenu vseh ostalih uporabnikov."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Želite uporabnika nastaviti zdaj?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Prepričajte se, da ima oseba čas za nastavitev svojega prostora v tabličnem računalniku"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Želite zdaj nastaviti profil?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Nastavitev vpliva na vse uporabnike v tem telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Spremenjen jezik"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Spremenjena velikost pisave"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Omejitve"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Odstranitev omejitev"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Sprememba kode PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Pokaži obvestila"</string>
     <string name="help_label" msgid="1107174367904110532">"Pomoč"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Račun za vsebino"</string>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 8552560573b..e78eb2bde95 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Локација"</item>
     <item msgid="255608127647030286">"Лично"</item>
     <item msgid="4588829735729884491">"Размена порука"</item>
-    <item msgid="8971765125227378270">"Уређај"</item>
+    <item msgid="886742181977884584">"Медији"</item>
+    <item msgid="7924928667052300589">"Уређај"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"оквирна локација"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"пуштање аудио записа"</item>
     <item msgid="8374996688066472414">"читање меморије"</item>
     <item msgid="3045529469061083747">"мењање меморије"</item>
+    <item msgid="5124443975763747838">"дугмад за медије"</item>
+    <item msgid="4547883971364273343">"аудио фокус"</item>
+    <item msgid="2603878814882344450">"главна јачина звука"</item>
+    <item msgid="7136963238377062018">"јачина звука гласа"</item>
+    <item msgid="4270236897655923007">"јачина звука звона"</item>
+    <item msgid="6325739889222559394">"јачина звука медија"</item>
+    <item msgid="5762123934816216821">"јачина звука аларма"</item>
+    <item msgid="785049718065337473">"јачина звука обавештења"</item>
+    <item msgid="6700305533746877052">"јачина звука Bluetooth-а"</item>
+    <item msgid="2029227495214047094">"задржавање ван стања спавања"</item>
+    <item msgid="26109888160231211">"праћење локације"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Локација"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Пуштање аудио записа"</item>
     <item msgid="136815868796597058">"Читање меморије"</item>
     <item msgid="5238692940326972503">"Мењање меморије"</item>
+    <item msgid="5753789168376302997">"Дугмад за медије"</item>
+    <item msgid="3265262911688671938">"Аудио фокус"</item>
+    <item msgid="2098976479485046797">"Главна јачина звука"</item>
+    <item msgid="5660213838861789350">"Јачина звука гласа"</item>
+    <item msgid="7983336752371254444">"Јачина звука звона"</item>
+    <item msgid="7878027809189330917">"Јачина звука медија"</item>
+    <item msgid="7260546305036218513">"Јачина звука аларма"</item>
+    <item msgid="9103719301075748925">"Јачина звука обавештења"</item>
+    <item msgid="7025966722295861512">"Јачина звука Bluetooth-а"</item>
+    <item msgid="4665183401128289653">"Задржи ван стања спавања"</item>
+    <item msgid="8584357129746649222">"Локација"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кратко"</item>
     <item msgid="2560532955514699713">"Средње"</item>
     <item msgid="2372711992605524591">"Дугачко"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (отклањање грешака)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Коришћење Dalvik-а"</item>
+    <item msgid="5131846588686178907">"Коришћење ART-а"</item>
+    <item msgid="4530003713865319928">"Коришћење ART верзије за отклањање грешака"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Никад не проверавај"</item>
     <item msgid="6042769699089883931">"Потражи само DRM садржај"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"На екрану у виду линија"</item>
     <item msgid="120512413928262547">"У adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Искључи"</item>
+    <item msgid="7688197031296835369">"Прикажи области преклапања"</item>
+    <item msgid="8332661909019981149">"Прикажи бројач преклапања"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандардно ограничење"</item>
     <item msgid="4071574792028999443">"Без позадинских процеса"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 28747652245..ba760e56b37 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -275,8 +275,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_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>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Захтева нумерички PIN или лозинку за дешифровање таблета сваки пут када га укључите"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Захтева нумерички PIN или лозинку за дешифровање телефона сваки пут када га укључите"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Шифровано"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када будете шифровали таблет, потребно је да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључите. Не можете да дешифрујете таблет осим ако га не вратите на фабричке податке, чиме ћете избрисати све податке."\n\n"Шифровање траје сат времена или дуже. Потребно је да почнете са напуњеном батеријом и да не искључујете таблет док се шифровање не доврши. Ако прекинете процес шифровања, изгубићете све податке или део њих."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када будете шифровали телефон, потребно је да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључите. Не можете да дешифрујете телефон осим ако га не вратите на фабричке податке, чиме ћете избрисати све податке."\n\n"Шифровање траје сат времена или дуже. Потребно је да почнете са напуњеном батеријом и да не искључујете телефон док се шифровање не доврши. Ако прекинете процес шифровања, изгубићете све податке или део њих."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када будете шифровали таблет, потребно је да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључите. Не можете да дешифрујете таблет осим ако га не вратите на фабричке податке, чиме ћете избрисати све податке.\n\nШифровање траје сат времена или дуже. Потребно је да почнете са напуњеном батеријом и да не искључујете таблет док се шифровање не доврши. Ако прекинете процес шифровања, изгубићете све податке или део њих."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када будете шифровали телефон, потребно је да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључите. Не можете да дешифрујете телефон осим ако га не вратите на фабричке податке, чиме ћете избрисати све податке.\n\nШифровање траје сат времена или дуже. Потребно је да почнете са напуњеном батеријом и да не искључујете телефон док се шифровање не доврши. Ако прекинете процес шифровања, изгубићете све податке или део њих."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Шифруј таблет"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Шифруј телефон"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Напуните батерију и покушајте поново."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Покушајте поново за <xliff:g id="DELAY">^1</xliff:g> секунди."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Унесите лозинку"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифровање није успело"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на таблету више нису доступни. "\n\n" Да бисте наставили да користите таблет, потребно је да га вратите на фабричка подешавања. Када подесите таблет након враћања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на телефону више нису доступни. "\n\n"Да бисте наставили да користите телефон, потребно је да га вратите на фабричка подешавања. Када подесите телефон након враћања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на таблету више нису доступни. \n\n Да бисте наставили да користите таблет, потребно је да га вратите на фабричка подешавања. Када подесите таблет након враћања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шифровање је прекинуто и не може да се доврши. Као последица тога, подаци на телефону више нису доступни. \n\nДа бисте наставили да користите телефон, потребно је да га вратите на фабричка подешавања. Када подесите телефон након враћања на фабричка подешавања, имаћете прилику да вратите све податке за које сте направили резервне копије на Google налогу."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Пребаци методе уноса"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Избор закључав. екрана"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Закључавање рез. коп."</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Повезивање"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Повезан"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Доступан"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"У употреби"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Подешавања екрана"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Желите ли да прекинете везу?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Овим ћете прекинути везу са уређајем:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,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="8850161330437693895">"Wi‑Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Обезбеђено помоћу <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", обезбеђено помоћу <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ништа"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Због побољшања прецизности локације и у друге сврхе, <xliff:g id="APP_NAME">%1$s</xliff:g> жели да укључи скенирање мреже чак и када је Wi-Fi искључен."\n\n"Желите ли да дозволите ово за све апликације које желе да скенирају?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Због побољшања прецизности локације и у друге сврхе, <xliff:g id="APP_NAME">%1$s</xliff:g> жели да укључи скенирање мреже чак и када је Wi-Fi искључен.\n\nЖелите ли да дозволите ово за све апликације које желе да скенирају?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дозволи"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Одбиј"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Повежи"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"УПОЗОРЕЊЕ: Можете да изазовете додатне трошкове оператера за пренос података.\n\nПодешавање таблета може да захтева значајну активност на мрежи."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"УПОЗОРЕЊЕ: Можете да изазовете додатне трошкове оператера за пренос података.\n\nПодешавање телефона може да захтева значајну активност на мрежи."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"УПОЗОРЕЊЕ: Док не успоставите интернет везу, таблет неће моћи да верификује да је софтвер ажуриран."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"УПОЗОРЕЊЕ: Док не успоставите интернет везу, телефон неће моћи да верификује да је софтвер ажуриран."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Таблет није могао да се повеже са овом Wi-Fi мрежом."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Нетачан PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN-ови се не подударају"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Није могуће променити PIN."\n"Могуће је да је PIN нетачан."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Није могуће променити PIN.\nМогуће је да је PIN нетачан."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN је успешно промењен"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Није могуће променити стање закључавања SIM картице."\n"Могуће је да је PIN нетачан."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Није могуће променити стање закључавања SIM картице.\nМогуће је да је PIN нетачан."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Потврди"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Откажи"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Статус таблета"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Враћање фабричких података"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Брише све податке са таблета"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Брише све податке у телефону"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Овим бришете све податке из "<b>"интерне меморије"</b>" таблета, укључујући:"\n\n<li>"Google налог"</li>\n<li>"Податке и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Овим бришете све податке из "<b>"интерне меморије"</b>" телефона, укључујући:"\n\n<li>"Google налог"</li>\n<li>"Податке и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Тренутно сте пријављени на следеће налоге:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Овим бришете све податке из "<b>"интерне меморије"</b>" таблета, укључујући:\n\n"<li>"Google налог"</li>\n<li>"Податке и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Овим бришете све податке из "<b>"интерне меморије"</b>" телефона, укључујући:\n\n"<li>"Google налог"</li>\n<li>"Податке и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Тренутно сте пријављени на следеће налоге:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Фотографије"</li>\n<li>"Други кориснички подаци"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Да бисте обрисали музику, слике и друге корисничке податке, потребно је да избришете "<b>"USB меморију"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Да бисте обрисали музику, слике и друге корисничке податке, потребно је да избришете садржај "<b>"SD картице"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Прикажи кеширане процесе"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Ресетуј подешавања аплик."</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Жел. да ресет. под. апл.?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Овим ћете ресетовати сва подешавања за:"\n\n" "<li>"Онемогућене апликације"</li>\n" "<li>"Обавештења о онемогућеним апликацијама"</li>\n" "<li>"Подразумеване апликације за радње"</li>\n" "<li>"Ограничења података у позадини за апликације"</li>\n\n" Нећете изгубити никакве податке о апликацијама."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Овим ћете ресетовати сва подешавања за:\n\n "<li>"Онемогућене апликације"</li>\n" "<li>"Обавештења о онемогућеним апликацијама"</li>\n" "<li>"Подразумеване апликације за радње"</li>\n" "<li>"Ограничења података у позадини за апликације"</li>\n\n" Нећете изгубити никакве податке о апликацијама."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Ресетуј апликације"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Управљај простором"</string>
     <string name="filter" msgid="2018011724373033887">"Филтрирај"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Да бисте пребацили, притисните Control-Spacebar"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Подразумевано"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Распореди тастатуре"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Кориснички речник"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Лични речник"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Лични речници"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Лични речник"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Додај"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Додавање у речник"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Омогућите опцију за прављење извештаја о грешкама у менију напајања"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Не закључавај"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Екран неће бити у режиму спавања током пуњења"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Омогући snoop евиденцију за Bluetooth HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Сними све Bluetooth HCI пакете у датотеци"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Избор времена извршавања"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Избор времена извршавања"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Желите ли да поново покренете уређај да бисте променили време извршавања из <xliff:g id="OLD">%1$s</xliff:g> у <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Дозволи лажне локације"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Дозволи лажне локације"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Дозволи отклањање USB грешака?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Заштити USB меморију"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Апликације морају да захтевају дозволу за читање USB меморије"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Желите да заштитите USB меморију?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Када је USB меморија заштићена, апликације морају да захтевају дозволу за читање података из спољне меморије."\n\n"Неке апликације можда неће функционисати док их програмери не буду ажурирали."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Када је USB меморија заштићена, апликације морају да захтевају дозволу за читање података из спољне меморије.\n\nНеке апликације можда неће функционисати док их програмери не буду ажурирали."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Заштити SD картицу"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Апликације морају да захтевају дозволу за читање SD картице"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Желите да заштитите SD картицу?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Када је SD картица заштићена, апликације морају да захтевају дозволу за читање података из спољне меморије."\n\n"Неке апликације можда неће функционисати док их програмери не буду ажурирали."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Када је SD картица заштићена, апликације морају да захтевају дозволу за читање података из спољне меморије.\n\nНеке апликације можда неће функционисати док их програмери не буду ажурирали."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Локални терминал"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Омогући аплик. терминала за приступ локалном командном окружењу"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Избор гаџета"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Избор виџета"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Желите ли да направите виџет и дозволите приступ?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Услуге"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Систем"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Покрети за увећање"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Када је ова функција укључена, можете да увећавате и да умањујете приказ троструким додиром на екран."\n\n"Док сте у увећаном приказу, можете:"\n<ul><li>"да померате: Превуците два или више прстију преко екрана."</li>\n<li>"да прилагођавате ниво зумирања: Спојите два или више прстију или их раширите."</li></ul>\n\n"Такође можете привремено да увећате оно што вам је под прстом троструким додиром и задржавањем. У овом увећаном приказу можете да превлачите прст да бисте истраживали различите делове екрана. Подигните прст да бисте се вратили у претходни приказ."\n\n"Напомена: Троструки додир за увећање функционише свуда осим на тастатури и траци за навигацију."</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_global_gesture_preference_description" msgid="750438015254396963">"Када је ова функција укључена, функције приступачности можете брзо да омогућите у два корака:\n\n1. корак: Притисните и задржите дугме за напајање док не чујете звук или осетите вибрацију.\n\n2. корак: Додирните и задржите са два прста док не чујете звучну потврду.\n\nАко постоји више корисника уређаја, помоћу ове пречице на закључавању екрана можете привремено да омогућите приступачност док је уређај откључан."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Велики текст"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Увеличавање екрана"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Аутоматски ажурирај увелич. екрана"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack пружа говорне повратне информације како би помогао слепим корисницима и корисницима са слабим видом. Да ли желите да га бесплатно инсталирате са Android Market-а?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Није наведен опис."</string>
     <string name="settings_button" msgid="3006713718908152930">"Подешавања"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Штампање"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Подешавања штампања"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Услуге"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Желите ли да користите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> може да прима документе које штампате. Такви документи могу да садрже осетљиве податке."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Ниједна услуга није инсталирана"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Подешавања"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Додај штампаче"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Укључено"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Искључено"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Батерија"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Шта користи батерију"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Нема података о кориш. батерије"</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi је активан"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Таблет"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Телефон"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Подаци су послати"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Подаци су примљени"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Подаци за мобилне уређ. су посл."</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Подаци за мобил. уређ. су примљ."</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Wi‑Fi подаци су послати"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Wi‑Fi подаци су примљени"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Аудио"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Видео"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Трајање укључења"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ниво"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Утиче на тон изговореног текста"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Језик"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Језик није изабран"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Подешава глас специфичан за језик намењен говорном тексту"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Послушај пример"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Пуштање кратке демонстрације синтезе говора"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP није подржан."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Не можете да конфигуришете EAP Wi-Fi везу током подешавања. То можете да урадите након подешавања у одељку Подешавања &gt; Бежична веза и мреже."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Повезивање може да потраје неколико минута..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Додирните "<b>"Даље"</b>" да бисте наставили са подешавањем."\n\n"Додирните "<b>"Назад"</b>" да бисте се повезали са другом Wi‑Fi мрежом."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Додирните "<b>"Даље"</b>" да бисте наставили са подешавањем.\n\nДодирните "<b>"Назад"</b>" да бисте се повезали са другом Wi‑Fi мрежом."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Синхронизација је омогућена"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синхронизација је онемогућена"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Грешка при синхронизацији."</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Отклони грешке GPU преклапања"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Онемог. HW пост. елементе"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Увек користи GPU за компоновање екрана"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Омогући OpenGL трагове"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Онемогући позадинске податке у мобилним мрежама. Користи немобилне мреже ако су доступне."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"За ограничење позадинских података за ову апл. прво ограничите мобилне податке."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Желите ли да ограничите позадинске податке?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ова функција може да заустави апликацију која зависи од позадинских података када су доступне само мобилне мреже."\n\n"Адекватније контроле за коришћење података можете да пронађете у подешавањима доступним у оквиру апликације."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ова функција може да заустави апликацију која зависи од позадинских података када су доступне само мобилне мреже.\n\nАдекватније контроле за коришћење података можете да пронађете у подешавањима доступним у оквиру апликације."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Ограничавање позадинских података је могуће само када будете подесили ограничење за мобилне податке."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Укључити аутом. синх. података?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Све промене које обавите на налозима на вебу биће аутоматски копиране на таблет."\n\n"Неки налози могу и да аутоматски копирају на Веб све промене које обавите на таблету. Google налог функционише на овај начин."\n\n"Да бисте изабрали које ће се врсте информација синхронизовати између сваког налога, идите на Подешавања &gt; Налози."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Све промене које обавите на налозима на вебу биће аутоматски копиране на телефон."\n\n"Неки налози могу и да аутоматски копирају на Веб све промене које обавите на телефону. Google налог функционише на овај начин."\n\n"Да бисте изабрали које ће се врсте информација синхронизовати између сваког налога, идите на Подешавања &gt; Налози."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Све промене које обавите на налозима на вебу биће аутоматски копиране на таблет.\n\nНеки налози могу и да аутоматски копирају на Веб све промене које обавите на таблету. Google налог функционише на овај начин.\n\nДа бисте изабрали које ће се врсте информација синхронизовати између сваког налога, идите на Подешавања &gt; Налози."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Све промене које обавите на налозима на вебу биће аутоматски копиране на телефон.\n\nНеки налози могу и да аутоматски копирају на Веб све промене које обавите на телефону. Google налог функционише на овај начин.\n\nДа бисте изабрали које ће се врсте информација синхронизовати између сваког налога, идите на Подешавања &gt; Налози."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Искључити аутом. синх. података?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"На овај начин ће се смањити потрошња података и батерије, али биће потребно да ручно синхронизујете сваки налог да бисте прикупили недавне информације. Нећете примати ни обавештења када дође до ажурирања."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Датум враћања циклуса потрошње на почетне вредности"</string>
@@ -1751,14 +1769,14 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Подешавање упозорења о коришћењу података"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Подешавање ограничења за коришћење података"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ограничавање потрошње података"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Мобилна веза за пренос података биће онемогућена када се достигне назначено ограничење."\n\n"Пошто таблет мери потрошњу података, а оператер може да обрачунава потрошњу на други начин, размотрите коришћење нижег ограничења."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Мобилна веза за пренос података биће онемогућена када се достигне назначено ограничење."\n\n"Пошто телефон мери потрошњу података, а оператер може да обрачунава потрошњу на други начин, размотрите коришћење нижег ограничења."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Мобилна веза за пренос података биће онемогућена када се достигне назначено ограничење.\n\nПошто таблет мери потрошњу података, а оператер може да обрачунава потрошњу на други начин, размотрите коришћење нижег ограничења."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Мобилна веза за пренос података биће онемогућена када се достигне назначено ограничење.\n\nПошто телефон мери потрошњу података, а оператер може да обрачунава потрошњу на други начин, размотрите коришћење нижег ограничења."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Желите ли да ограничите позадинске податке?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Ако ограничите позадинске податке за мобилне уређаје, неке апликације и услуге неће функционисати ако нисте повезани са Wi-Fi мрежом."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ако ограничите позадинске податке за мобилне уређаје, неке апликације и услуге неће функционисати ако нисте повезани са Wi-Fi мрежом."\n\n"Ово подешавање утиче на све кориснике овог таблета."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ако ограничите позадинске податке за мобилне уређаје, неке апликације и услуге неће функционисати ако нисте повезани са Wi-Fi мрежом."\n\n"Ово подешавање утиче на све кориснике овог телефона."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ако ограничите позадинске податке за мобилне уређаје, неке апликације и услуге неће функционисати ако нисте повезани са Wi-Fi мрежом.\n\nОво подешавање утиче на све кориснике овог таблета."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ако ограничите позадинске податке за мобилне уређаје, неке апликације и услуге неће функционисати ако нисте повезани са Wi-Fi мрежом.\n\nОво подешавање утиче на све кориснике овог телефона."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"упозорење"</font></string>
-    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"Ограничење"\n"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font><font size="12"></font></string>
+    <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"Ограничење\n<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font><font size="12"></font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Уклоњене апликације"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Уклоњене апликације и корисници"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"Примљених: <xliff:g id="RECEIVED">%1$s</xliff:g>, послатих: <xliff:g id="SENT">%2$s</xliff:g>"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Корисник"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ограничени профил"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Додавање новог корисника"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Овај уређај можете да делите са другим људима тако што ћете направити додатне кориснике. Сваки корисник има сопствени простор, који може да прилагођава помоћу својих апликација, позадина итд. Корисници могу да прилагођавају и подешавања таблета као што је Wi-Fi, која утичу на свакога."\n\n"Када направите новог корисника, та особа треба да обави подешавање."\n\n"Сваки корисник може да прихвата ажуриране дозволе апликација у име свих осталих корисника."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"Када направите новог корисника, та особа треба да обави подешавање."\n\n"Сваки корисник може да прихвата ажуриране дозволе апликација у име свих осталих корисника."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Овај уређај можете да делите са другим људима тако што ћете направити додатне кориснике. Сваки корисник има сопствени простор, који може да прилагођава помоћу својих апликација, позадина итд. Корисници могу да прилагођавају и подешавања таблета као што је Wi-Fi, која утичу на свакога.\n\nКада направите новог корисника, та особа треба да обави подешавање.\n\nСваки корисник може да прихвата ажуриране дозволе апликација у име свих осталих корисника."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Када направите новог корисника, та особа треба да обави подешавање.\n\nСваки корисник може да прихвата ажуриране дозволе апликација у име свих осталих корисника."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Подешавате корисника одмах?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Уверите се да особа може да узме таблет и подеси свој простор"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Желите ли да одмах подесите профил?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ово подешавање утиче на све кориснике овог телефона."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Промена језика"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Промена величине фонта"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Ограничења"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Уклони ограничења"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Промени PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Прикажи обавештења"</string>
     <string name="help_label" msgid="1107174367904110532">"Помоћ"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Налог за садржај"</string>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 941aee8256f..802a30f6167 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Plats"</item>
     <item msgid="255608127647030286">"Personligt"</item>
     <item msgid="4588829735729884491">"Meddelanden"</item>
-    <item msgid="8971765125227378270">"Enhet"</item>
+    <item msgid="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Enhet"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"ungefärlig plats"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"spela upp ljud"</item>
     <item msgid="8374996688066472414">"läs Urklipp"</item>
     <item msgid="3045529469061083747">"ändra Urklipp"</item>
+    <item msgid="5124443975763747838">"medieknappar"</item>
+    <item msgid="4547883971364273343">"ljudinställning"</item>
+    <item msgid="2603878814882344450">"mastervolym"</item>
+    <item msgid="7136963238377062018">"röstvolym"</item>
+    <item msgid="4270236897655923007">"ringvolym"</item>
+    <item msgid="6325739889222559394">"medievolym"</item>
+    <item msgid="5762123934816216821">"alarmvolym"</item>
+    <item msgid="785049718065337473">"meddelandevolym"</item>
+    <item msgid="6700305533746877052">"bluetooth-volym"</item>
+    <item msgid="2029227495214047094">"behåll aktiv"</item>
+    <item msgid="26109888160231211">"övervaka plats"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Plats"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Spela upp ljud"</item>
     <item msgid="136815868796597058">"Läs Urklipp"</item>
     <item msgid="5238692940326972503">"Ändra Urklipp"</item>
+    <item msgid="5753789168376302997">"Medieknappar"</item>
+    <item msgid="3265262911688671938">"Ljudinställning"</item>
+    <item msgid="2098976479485046797">"Huvudvolym"</item>
+    <item msgid="5660213838861789350">"Röstvolym"</item>
+    <item msgid="7983336752371254444">"Ringvolym"</item>
+    <item msgid="7878027809189330917">"Medievolym"</item>
+    <item msgid="7260546305036218513">"Alarmvolym"</item>
+    <item msgid="9103719301075748925">"Meddelandevolym"</item>
+    <item msgid="7025966722295861512">"Bluetooth-volym"</item>
+    <item msgid="4665183401128289653">"Behåll aktiv"</item>
+    <item msgid="8584357129746649222">"Plats"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Mellan"</item>
     <item msgid="2372711992605524591">"Lång"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (felsökning)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Använd Dalvik"</item>
+    <item msgid="5131846588686178907">"Använd ART"</item>
+    <item msgid="4530003713865319928">"Använd felsökningsversionen av ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Kontrollera aldrig"</item>
     <item msgid="6042769699089883931">"Kontrollera bara DRM-innehåll"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"På skärmen som rader"</item>
     <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Av"</item>
+    <item msgid="7688197031296835369">"Visa områden som överskrider gränsen"</item>
+    <item msgid="8332661909019981149">"Visa antal som överskrider gränsen"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardgräns"</item>
     <item msgid="4071574792028999443">"Inga bakgrundsprocesser"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 7d1db191405..4e2273c7211 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -275,8 +275,8 @@
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Du förlorade dataanslutningen eftersom du lämnade ditt hemnätverk utan att aktivera dataroaming."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Aktivera"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"När du tillåter dataroaming kan det tillkomma vissa avgifter!"</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Om du tillåter dataroaming kan det leda till höga kostnader."\n\n"Den här inställningen påverkar samtliga användare."</string>
-    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Om du tillåter dataroaming kan det leda till höga kostnader."\n\n"Den här inställningen påverkar samtliga användare."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Om du tillåter dataroaming kan det leda till höga kostnader.\n\nDen här inställningen påverkar samtliga användare."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Om du tillåter dataroaming kan det leda till höga kostnader.\n\nDen här inställningen påverkar samtliga användare."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Vill du tillåta dataroaming?"</string>
     <string name="networks" msgid="6333316876545927039">"Val av operatör"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Välj en nätverksoperatör"</string>
@@ -322,8 +322,8 @@
     <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 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_desc" product="tablet" msgid="3839235202103924154">"Du kan kryptera dina konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du krypterar surfplattan måste du ange en numerisk PIN-kod eller ett lösenord och dekryptera enheten varje gång du startar den. Det går endast att ta bort krypteringen genom att återställa standardinställningarna, vilket raderar alla dina data.\n\nKrypteringen tar en timme eller mer. Ladda batteriet helt innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter den pågående krypteringen kommer du att förlora delar av eller alla dina data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Du kan kryptera dina konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du krypterar mobilen måste du ange en numerisk PIN-kod eller ett lösenord och dekryptera enheten varje gång du startar den. Det går endast att ta bort krypteringen genom att återställa standardinställningarna, vilket raderar alla dina data.\n\nKrypteringen tar en timme eller mer. Ladda batteriet helt innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter den pågående krypteringen kommer du att förlora delar av eller alla dina data."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Kryptera surfplattan"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Kryptera telefonen"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Ladda batteriet och försök igen."</string>
@@ -339,8 +339,8 @@
     <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å 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_failed_summary" product="tablet" msgid="4478225241476039013">"Krypteringen avbröts och kan inte slutföras. Data på surfplattan är därför inte tillgängliga längre.\n\n Om du vill fortsätta använda surfplattan måste du återställa standardinställningarna. När du konfigurerar surfplattan efter återställningen kan du välja att återställa alla data som du har säkerhetskopierat i ditt Google-konto."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Krypteringen avbröts och kan inte slutföras. Data på mobilen är därför inte tillgängliga längre.\n\nOm du vill fortsätta använda mobilen måste du återställa standardinställningarna. När du konfigurerar enheten efter återställningen kan du välja att återställa alla data som du har säkerhetskopierat i ditt Google-konto."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Växla inmatningsmetod"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Välj skärmlås"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Välj lås för säkerhetskopiering"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Ansluter"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Anslutna"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Tillgängliga"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Används"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Skärminställningar"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Vill du koppla från?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Detta avslutar din anslutning till:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Av"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Inte tillgängligt eftersom NFC är inaktiverat"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"När den här funktionen är aktiverad kan du överföra appinnehåll till en annan NFC-kompatibel enhet genom att hålla enheterna mot varandra. Du kan t.ex. överföra webbläsarsidor, YouTube-videoklipp, kontakter med mera."\n\n"Håll bara enheterna mot varandra (oftast baksida mot baksida) och tryck sedan på skärmen. Appen avgör vad som överförs."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"När den här funktionen är aktiverad kan du överföra appinnehåll till en annan NFC-kompatibel enhet genom att hålla enheterna mot varandra. Du kan t.ex. överföra webbläsarsidor, YouTube-videoklipp, kontakter med mera.\n\nHåll bara enheterna mot varandra (oftast baksida mot baksida) och tryck sedan på skärmen. Appen avgör vad som överförs."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Hitta nätverkstjänst"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Tillåt att appar på andra enheter hittar appar på den här enheten"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Skyddad med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", skyddad med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> vill aktivera nätverkssökning även när Wi-Fi är avstängt för att kunna förbättra positionens exakthet och andra ändamål."\n\n"Vill du tillåta detta för alla appar som vill söka efter nätverk?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> vill aktivera nätverkssökning även när Wi-Fi är avstängt för att kunna förbättra positionens exakthet och andra ändamål.\n\nVill du tillåta detta för alla appar som vill söka efter nätverk?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillåt"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Avvisa"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Anslut"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"VARNING! Eventuella operatörsavgifter för datatrafik kan tillkomma.\n\nKonfigurationen kan kräva betydande nätverksaktivitet."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"VARNING! Eventuella operatörsavgifter för datatrafik kan tillkomma.\n\nKonfigurationen kan kräva betydande nätverksaktivitet."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"Varning! Om du inte är ansluten till internet kan surfplattan inte verifiera att programvaran är uppdaterad."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"Varning! Om du inte är ansluten till internet kan mobilen inte verifiera att programvaran är uppdaterad."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Det gick inte att ansluta surfplattan till Wi-Fi-nätverket."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN-kod för SIM-kort"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Fel PIN-kod"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN-koderna matchar inte"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Det går inte att ändra PIN-koden."\n" Du kan ha angett fel PIN-kod."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Det går inte att ändra PIN-koden.\n Du kan ha angett fel PIN-kod."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-kortets PIN-kod har ändrats"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Det gick inte att ändra SIM-kortets låsstatus."\n"Du kan ha angett fel PIN-kod."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Det gick inte att ändra SIM-kortets låsstatus.\nDu kan ha angett fel PIN-kod."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Avbryt"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Pekdatorns status"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Återställ standardinst."</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Raderar alla data på surfplattan"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Raderar alla data på telefonen"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Detta raderar alla data från pekdatorns "<b>"interna lagringsutrymme"</b>", bland annat:"\n\n<li>"ditt Google-konto"</li>\n<li>"system- och appdata och inställningar"</li>\n<li>"hämtade appar"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Detta raderar alla data från pekdatorns "<b>"interna lagringsutrymme"</b>", bland annat:"\n\n<li>"ditt Google-konto"</li>\n<li>"system- och appdata och inställningar"</li>\n<li>"hämtade appar"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du är inloggad på följande konton:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Detta raderar alla data från pekdatorns "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"ditt Google-konto"</li>\n<li>"system- och appdata och inställningar"</li>\n<li>"hämtade appar"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Detta raderar alla data från pekdatorns "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"ditt Google-konto"</li>\n<li>"system- och appdata och inställningar"</li>\n<li>"hämtade appar"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du är inloggad på följande konton:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Foton"</li>\n<li>"Andra användardata"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Om du vill ta bort musik, bilder och andra användardata måste du radera "<b>"USB-lagringsenheten"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Om du vill ta bort musik, bilder och andra användardata måste du radera "<b>"SD-kortet"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Visa cachade processer"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Återställ inställningarna"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vill du återställa?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Detta återställer alla inställningar för:"\n\n" "<li>"inaktiverade appar"</li>\n" "<li>"meddelanden om inaktiverade appar"</li>\n" "<li>"standardappar för olika åtgärder"</li>\n" "<li>"begränsningar för bakgrundsdata i appar."</li>\n\n" Inga appdata går förlorade."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Detta återställer alla inställningar för:\n\n "<li>"inaktiverade appar"</li>\n" "<li>"meddelanden om inaktiverade appar"</li>\n" "<li>"standardappar för olika åtgärder"</li>\n" "<li>"begränsningar för bakgrundsdata i appar."</li>\n\n" Inga appdata går förlorade."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Återställ appar"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Hantera utrymme"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrera"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Växla genom att trycka på Ctrl-Mellanslag"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Standard"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Tangentbordslayouter"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Användarens ordlista"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Egen ordlista"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Egna ordlistor"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Egen ordlista"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Lägg till"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Lägg till i ordlista"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Inkludera alternativet att skapa en felrapport på startmenyn"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Håll aktiverad"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skärmen vilar aldrig när laddning pågår"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktivera HCI snoop-logg för Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Samla alla HCI-paket för Bluetooth i en fil"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Välj körningstid"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Välj körningstid"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Vill du starta om och ändra körningstiden från <xliff:g id="OLD">%1$s</xliff:g> till <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Tillåt skenplatser"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillåt skenplatser"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Ska USB-felsökning tillåtas?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Skydda USB-lagringsenheten"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Appar måste få tillstånd för att kunna läsa USB-enheten"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Vill du skydda USB-enheten?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"När USB-lagringsenheten är skyddad måste apparna begära tillstånd för att kunna läsa data som lagras externt."\n\n"En del appar måste eventuellt uppdateras av utvecklaren för att fungera."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"När USB-lagringsenheten är skyddad måste apparna begära tillstånd för att kunna läsa data som lagras externt.\n\nEn del appar måste eventuellt uppdateras av utvecklaren för att fungera."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Skydda SD-kortet"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Appar måste få tillstånd för att kunna läsa SD-kortet"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vill du skydda SD-kortet?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"När SD-kortet är skyddat måste apparna begära tillstånd för att kunna läsa data som lagras externt."\n\n"En del appar måste eventuellt uppdateras av utvecklaren för att fungera."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"När SD-kortet är skyddat måste apparna begära tillstånd för att kunna läsa data som lagras externt.\n\nEn del appar måste eventuellt uppdateras av utvecklaren för att fungera."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokal terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Aktivera en terminalapp som ger åtkomst till hyllor lokalt"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Välj gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Välj widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Skapa widget och tillåta åtkomst?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Tjänster"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</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_screen_magnification_summary" msgid="2380627654189671754">"När den här funktionen är aktiverad kan du zooma in och ut genom att trycka tre gånger på skärmen.\n\nNär du har zoomat in kan du göra följande saker:\n"<ul><li>"Panorera: Dra minst två fingrar över skärmen."</li>\n<li>"Justera zoomen: Nyp eller dra isär med minst två fingrar."</li></ul>\n\n"Du kan också förstora något tillfälligt genom att trycka tre gånger på det och hålla kvar. I det förstorade läget kan du utforska olika delar av skärmen genom att dra med fingret. Återgå till föregående läge genom att släppa fingret.\n\nObs! Det går att förstora genom att trycka tre gånger överallt utom på tangentbordet och navigeringsfältet."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Aktivera tillgänglighet snabbt"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"På"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Av"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"När den här funktionen är aktiverad kan du snabbt aktivera tillgänglighetsfunktioner i två steg:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"När den här funktionen är aktiverad kan du snabbt aktivera tillgänglighetsfunktioner i två steg:\n\nSteg 1: Tryck länge på strömbrytaren tills du hör ett ljud eller känner en vibration.\n\nSteg 2: Tryck länge med två fingrar tills en bekräftelse läses upp.\n\nOm genvägen på den låsta skärmen används och flera personer använder enheten, aktiveras tillgänglighetsalternativen tillfälligt tills enheten låses upp."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Stor text"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Skärmförstoring"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Uppdatera skärmförstoring automatiskt"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack ger talad feedback till användare som är blinda eller har nedsatt syn. Vill du installera den gratis från Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ingen beskrivning har angetts."</string>
     <string name="settings_button" msgid="3006713718908152930">"Inställningar"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Skriver ut"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Utskriftsinställningar"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Tjänster"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Vill du använda <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> kan ta emot dokument som du skriver ut. Sådana dokument kan innehålla känsliga uppgifter."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Inga tjänster är installerade"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Inställningar"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Lägg till skrivare"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"På"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Av"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Appar som har förbrukat batteriet"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Batteriinfo ej tillgänglig."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi körs"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Surfplatta"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Skickade data"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Mottagna data"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Mobildata har skickats"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Mobildata har mottagits"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Data via Wi-Fi har skickats"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Data via Wi-Fi har mottagits"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Ljud"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Tid aktiverad"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ton"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Påverkar den talade textens ton"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Språk"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Inget språk valt"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Ange språkspecifik röst för den talade texten"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Lyssna på ett exempel"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Spela upp en kort demonstration av talsyntes"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP stöds inte."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Det går inte att konfigurera en EAP-Wi-Fi-anslutning under installationen. Efter installationen kan du göra det i Inställningar &gt; Trådlöst och nätverk."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Det kan ta några minuter att ansluta ..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Tryck på "<b>"Nästa"</b>" om du vill fortsätta med installationen."\n\n"Tryck på "<b>"Tillbaka"</b>" om du vill ansluta till ett annat Wi-Fi-nätverk."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Tryck på "<b>"Nästa"</b>" om du vill fortsätta med installationen.\n\nTryck på "<b>"Tillbaka"</b>" om du vill ansluta till ett annat Wi-Fi-nätverk."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronisering aktiverad"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synkronisering inaktiverad"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Synkroniseringsfel."</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Felsök överskriden GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Inaktivera HW-överlagringar"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Använd alltid GPU för skärmsammansättning"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktivera OpenGL-spår"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Inaktivera bakgrundsdata i mobildatanät. Fasta nätverksuppkopplingar används om sådana finns."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Om du vill begränsa bakgrundsdata för appen måste du först ange en gräns för mobildata."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Vill du begränsa bakgrundsdata?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Den här funktionen kan medföra att en app som använder bakgrundsdata slutar fungera när endast mobila nätverk är tillgängliga."\n\n"Du kan hitta fler alternativ för dataanvändning i inställningarna i appen."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Den här funktionen kan medföra att en app som använder bakgrundsdata slutar fungera när endast mobila nätverk är tillgängliga.\n\nDu kan hitta fler alternativ för dataanvändning i inställningarna i appen."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Det går bara att begränsa bakgrundsdata när du har angett en gräns för mobildata."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Aktivera automatisk datasynk.?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Alla kontoändringar som görs på webben kopieras automatiskt till 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_on_dialog" product="tablet" msgid="7312283529426636845">"Alla kontoändringar som görs på webben kopieras automatiskt till surfplattan.\n\nFör vissa konton kopieras även alla ändringar som görs på surfplattan automatiskt till webben. Google-konton fungerar på det sättet.\n\nDu kan ange vilken typ av information som ska synkroniseras för varje konto under Inställningar &gt; Konton."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Alla kontoändringar som görs på webben kopieras automatiskt till mobilen.\n\nFör vissa konton kopieras även alla ändringar som görs på mobilen automatiskt till webben. Google-konton fungerar på det sättet.\n\nDu kan ställa in vilken typ av information som ska synkroniseras för varje konto under Inställningar &gt; Konton."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Inaktivera automatisk datasynk.?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Detta minskar dataanvändningen och sparar batteri, men varje konto måste synkroniseras manuellt varje gång du vill samla in aktuell information. Du får inte heller några meddelanden om uppdateringar."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Återställningsdag för användningscykel"</string>
@@ -1751,12 +1769,12 @@
     <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 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_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="8447934953579275363">"Om du begränsar mobildata i bakgrunden kommer vissa appar och tjänster bara att fungera när du är ansluten till ett Wi-Fi-nätverk."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Om du begränsar användningen av mobildata i bakgrunden kommer vissa appar och tjänster bara att fungera när du är ansluten till ett Wi-Fi-nätverk."\n\n"Den här inställningen påverkar samtliga användare."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Om du begränsar användningen av mobildata i bakgrunden kommer vissa appar och tjänster bara att fungera när du är ansluten till ett Wi-Fi-nätverk."\n\n"Den här inställningen påverkar samtliga användare."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Om du begränsar användningen av mobildata i bakgrunden kommer vissa appar och tjänster bara att fungera när du är ansluten till ett Wi-Fi-nätverk.\n\nDen här inställningen påverkar samtliga användare."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Om du begränsar användningen av mobildata i bakgrunden kommer vissa appar och tjänster bara att fungera när du är ansluten till ett Wi-Fi-nätverk.\n\nDen här inställningen påverkar samtliga användare."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"varning"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"gräns"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Borttagna appar"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Användare"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Begränsad profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Lägg till en ny användare"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Du kan dela den här enheten med andra genom att skapa fler användare. Alla användare har sitt eget utrymme som de kan anpassa med appar, bakgrunder med mera. Användarna kan även justera inställningar för surfplattan som påverkar alla andra, till exempel för Wi-Fi."\n\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_add_user_message_long" msgid="3086244205384741788">"Du kan dela den här enheten med andra genom att skapa fler användare. Alla användare har sitt eget utrymme som de kan anpassa med appar, bakgrunder med mera. Användarna kan även justera inställningar för surfplattan som påverkar alla andra, till exempel för Wi-Fi.\n\nNär du skapar en ny användare måste han eller hon genomgå en konfigureringsprocess.\n\nAlla användare kan godkänna uppdaterade appbehörigheter för alla andra användare."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"När du skapar en ny användare måste han eller hon genomgå en konfigureriringsprocess.\n\nAlla användare kan godkänna uppdaterade appbehörigheter för alla andra användare."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Konfigurera användare nu?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Se till att personen har möjlighet att använda surfplattan och konfigurera sitt utrymme"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Vill du konfigurera en profil nu?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Den här inställningen påverkar samtliga användare."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Ändra språk"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Ändra teckenstorlek"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Begränsningar"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Ta bort begränsningar"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Ändra PIN-koden"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Visa meddelanden"</string>
     <string name="help_label" msgid="1107174367904110532">"Hjälp"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Konto för innehåll"</string>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index d7c0c7b717d..5525a542473 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -31,7 +31,7 @@
   </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"Sekunde 15"</item>
-    <item msgid="8881760709354815449">"sekunde 30"</item>
+    <item msgid="8881760709354815449">"Sekunde 30"</item>
     <item msgid="7589406073232279088">"Dakika 1"</item>
     <item msgid="7001195990902244174">"Dakika 2"</item>
     <item msgid="7489864775127957179">"Dakika 5"</item>
@@ -41,7 +41,7 @@
   <string-array name="dream_timeout_entries">
     <item msgid="3149294732238283185">"Katu"</item>
     <item msgid="2194151041885903260">"Sekunde 15"</item>
-    <item msgid="5892295237131074341">"sekunde 30"</item>
+    <item msgid="5892295237131074341">"Sekunde 30"</item>
     <item msgid="3538441365970038213">"Dakika 1"</item>
     <item msgid="412343871668955639">"Dakika 2"</item>
     <item msgid="5076853889688991690">"Dakika 5"</item>
@@ -55,7 +55,7 @@
     <item msgid="1822002388249545488">"Sekunde 30"</item>
     <item msgid="8538071621211916519">"Dakika 1"</item>
     <item msgid="5663439580228932882">"Dakika 2"</item>
-    <item msgid="49888496216106852">"dakika 5"</item>
+    <item msgid="49888496216106852">"Dakika 5"</item>
     <item msgid="9002737361305019353">"Dakika 10"</item>
     <item msgid="4322676235684793329">"Dakika 30"</item>
   </string-array>
@@ -141,7 +141,7 @@
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="8151962652413645395">"Dakika 2"</item>
-    <item msgid="8675215713017289017">"dakika 5"</item>
+    <item msgid="8675215713017289017">"Dakika 5"</item>
     <item msgid="477015974247590543">"Saa 1"</item>
     <item msgid="5198271470953124739">"Kamwe muda usiishe"</item>
   </string-array>
@@ -153,12 +153,12 @@
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Daima"</item>
-    <item msgid="844721238536786870">"Wakati imechopekwa ndani"</item>
-    <item msgid="2990218920631468642">"Kamwe ( huongeza utumizi wa data)"</item>
+    <item msgid="844721238536786870">"Wakati inachaji pekee"</item>
+    <item msgid="2990218920631468642">"Kamwe (huongeza matumizi ya data)"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Daima"</item>
-    <item msgid="7433294150916905997">"Wakati imechopekwa ndani"</item>
+    <item msgid="7433294150916905997">"Wakati inachaji pekee"</item>
     <item msgid="1390404486722375028">"kamwe"</item>
   </string-array>
   <string-array name="wifi_frequency_band_entries">
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Eneo"</item>
     <item msgid="255608127647030286">"Binafsi"</item>
     <item msgid="4588829735729884491">"Utumaji ujumbe"</item>
-    <item msgid="8971765125227378270">"Kifaa"</item>
+    <item msgid="886742181977884584">"Vyombo vya Habari"</item>
+    <item msgid="7924928667052300589">"Kifaa"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"eneo lisilo laini"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"cheza sauti"</item>
     <item msgid="8374996688066472414">"soma ubao klipu"</item>
     <item msgid="3045529469061083747">"badilisha ubao klipu"</item>
+    <item msgid="5124443975763747838">"vitufe vya vyombo vya habari"</item>
+    <item msgid="4547883971364273343">"mkazo wa sauti"</item>
+    <item msgid="2603878814882344450">"sauti kuu"</item>
+    <item msgid="7136963238377062018">"kiwango cha sauti"</item>
+    <item msgid="4270236897655923007">"sauti ya mlio"</item>
+    <item msgid="6325739889222559394">"sauti ya midia"</item>
+    <item msgid="5762123934816216821">"sauti ya kengele"</item>
+    <item msgid="785049718065337473">"sauti ya arifa"</item>
+    <item msgid="6700305533746877052">"sauti ya bluetooth"</item>
+    <item msgid="2029227495214047094">"kaa chonjo"</item>
+    <item msgid="26109888160231211">"fuatilia eneo"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Eneo"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Cheza sauti"</item>
     <item msgid="136815868796597058">"Soma ubao klipu"</item>
     <item msgid="5238692940326972503">"Rekebisha ubao klipu"</item>
+    <item msgid="5753789168376302997">"Vitufe vya media"</item>
+    <item msgid="3265262911688671938">"Kotovu cha sauti"</item>
+    <item msgid="2098976479485046797">"Sauti kuu"</item>
+    <item msgid="5660213838861789350">"Kiwango cha sauti"</item>
+    <item msgid="7983336752371254444">"Sauti ya mlio"</item>
+    <item msgid="7878027809189330917">"Sauti ya media"</item>
+    <item msgid="7260546305036218513">"Sauti ya kengele"</item>
+    <item msgid="9103719301075748925">"Sauti ya arifa"</item>
+    <item msgid="7025966722295861512">"Sauti ya Bluetooth"</item>
+    <item msgid="4665183401128289653">"Kaa chonjo"</item>
+    <item msgid="8584357129746649222">"Eneo"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Fupi"</item>
     <item msgid="2560532955514699713">"Wastani"</item>
     <item msgid="2372711992605524591">"Ndefu"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (rekebisha hitilafu)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Tumia Dalvik"</item>
+    <item msgid="5131846588686178907">"Tumia ART"</item>
+    <item msgid="4530003713865319928">"Tumia ART kurekebisha muundo"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Katu usikague"</item>
     <item msgid="6042769699089883931">"Chunguza maudhui ya DRM pekee"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Kwenye skrini kama mistari"</item>
     <item msgid="120512413928262547">"Katika adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Zima"</item>
+    <item msgid="7688197031296835369">"Onyesha maeneo yaliyoondolewa"</item>
+    <item msgid="8332661909019981149">"Onyesha kihesabu kilichoondolewa"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Kiwango cha wastani"</item>
     <item msgid="4071574792028999443">"Hakuna mchakato wa mandari nyuma"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 9e516a27c1c..b7308086151 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -277,8 +277,8 @@
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Umepoteza muunganisho wa data kwa sababu uliondoka kwenye mtandao wako wa kawaida ukiwa umezima utumiaji data nje ya mtandao wa kawaida."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Iwashe"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Ukiruhusu data kupitia mitandao mingine, unaweza kupata gharama kubwa ya kupitia mitandao mingine!"</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Unaporuhusu data kupitia mitandao mingine, huenda ukatozwa gharama kubwa za matumizi ya nje!"\n\n"Mpangilio huu unaathiri watumiaji wote kwenye kompyuta hii ndogo."</string>
-    <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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Unaporuhusu data kupitia mitandao mingine, huenda ukatozwa gharama kubwa za matumizi ya nje!\n\nMpangilio huu unaathiri watumiaji wote kwenye kompyuta hii ndogo."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Unaporuhusu data kupitia mitandao mingine, huenda ukatozwa gharama kubwa za matumizi ya nje!\n\nMpangilio huu unaathiri watumiaji wote kwenye simu hii."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Ruhusu data kupitia mitandao mingine?"</string>
     <string name="networks" msgid="6333316876545927039">"Uchaguzi wa mtoa huduma"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Chagua mtoa huduma ya mtandao"</string>
@@ -324,8 +324,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Unahitaji PIN yenye nambari au nenosiri ili kusimbua kompyuta yako kibao kila unapoiwasha"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Unahitaji PIN yenye nambari au nenosiri ili kusimbua simu yako kila unapoiwasha"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Usimbaji fiche"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Unaweza kusimba akaunti zako, mipangilio, programu zilizopakuliwa na data yazo, vyombo vya habari na faili zingine. Ukisha simba kwenye kompyuta yako kibao, unahitaji kucharaza PIN ya nambari au nenosiri ili kuisimbua kila mara unapoiwasha. Huwezi kusimbua kompyuta yako kibao isipokuwa kwa kurejesha mipangilio ya kiwandani, na kufuta data yako yote."\n\n"Usimbaji fiche unachukua saa moja au zaidi. Lazima uanze na betri iliyo na chaji na uweke kompyuta yako kibao kwenye chaji mpaka usimbaji fiche ukamilike. Ukiingilia mchakato wa usimbaji fiche, utapoteza baadhi ya data au data yote."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Unaweza kusimba akaunti zako, mipangilio, programu zilizopakiwa na data yao, vyombo vya habari na faili zingine. Ukisha simba kwenye simu yako, unahitaji kucharaza PIN ya nambari au nenosiri ili kuisimbua kila mara unapoiwasha. Huwezi kusimbua simu yako isipokuwa kwa kurejesha mipangilio ya kiwandani,na kufuta data yako yote"\n\n"Usimbaji fiche huchukua saa moja au zaidi. Lazima uanze na betri iliyo na chaji na uweke simu yako kwenye chaji mpaka usimbaji fiche ukamilike. Ukiingilia mchakato wa usimbaji fiche, utapoteza baadhi ya data au data yote."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Unaweza kusimba akaunti zako, mipangilio, programu zilizopakuliwa na data yazo, vyombo vya habari na faili zingine. Ukisha simba kwenye kompyuta yako kibao, unahitaji kucharaza PIN ya nambari au nenosiri ili kuisimbua kila mara unapoiwasha. Huwezi kusimbua kompyuta yako kibao isipokuwa kwa kurejesha mipangilio ya kiwandani, na kufuta data yako yote.\n\nUsimbaji fiche unachukua saa moja au zaidi. Lazima uanze na betri iliyo na chaji na uweke kompyuta yako kibao kwenye chaji mpaka usimbaji fiche ukamilike. Ukiingilia mchakato wa usimbaji fiche, utapoteza baadhi ya data au data yote."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Unaweza kusimba akaunti zako, mipangilio, programu zilizopakiwa na data yao, vyombo vya habari na faili zingine. Ukisha simba kwenye simu yako, unahitaji kucharaza PIN ya nambari au nenosiri ili kuisimbua kila mara unapoiwasha. Huwezi kusimbua simu yako isipokuwa kwa kurejesha mipangilio ya kiwandani,na kufuta data yako yote\n\nUsimbaji fiche huchukua saa moja au zaidi. Lazima uanze na betri iliyo na chaji na uweke simu yako kwenye chaji mpaka usimbaji fiche ukamilike. Ukiingilia mchakato wa usimbaji fiche, utapoteza baadhi ya data au data yote."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Simba kompyuta kibao kwa njia fiche"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Simba fiche simu"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Tafadhali chaji betri yako kisha ujaribu tena."</string>
@@ -341,8 +341,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Jaribu tena baada ya sekunde <xliff:g id="DELAY">^1</xliff:g>."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Andika nenosiri yako"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Usimbaji fiche haujafanikiwa"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Usimbaji fiche umekatishwa na hauwezi kukamilika. Kutokana na hayo, data kwenye kompyuta yako kibao haiwezi kupatikana. "\n\n" Ili kuendelee kutumia kompyuta yako kibao, unahitaji kurejesha mipangilio ya kiwandani. Ukisha washa kompyuta yako kibao baada ya kurejesha, utakuwa na fursa ya kurejesha data yoyote iliyokuwa imechelezwa kwenye Akaunti yako ya Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Usimbaji fiche umekatishwa na hauwezi kukamilika. Kutokana na hayo, data kwenye simu yako haziwezi kuonekana. "\n\n" Ili kuendelea kutumia simu yako, utahitaji urejesha mipangilio ya kiwandani. Utakapowasha simu yako baada ya kurejesha, utakuwa na fursa ya kurejesha data zozote ulizocheleza kwenye Akaunti yako ya Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Usimbaji fiche umekatishwa na hauwezi kukamilika. Kutokana na hayo, data kwenye kompyuta yako kibao haiwezi kupatikana. \n\n Ili kuendelee kutumia kompyuta yako kibao, unahitaji kurejesha mipangilio ya kiwandani. Ukisha washa kompyuta yako kibao baada ya kurejesha, utakuwa na fursa ya kurejesha data yoyote iliyokuwa imechelezwa kwenye Akaunti yako ya Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Usimbaji fiche umekatishwa na hauwezi kukamilika. Kutokana na hayo, data kwenye simu yako haziwezi kuonekana. \n\n Ili kuendelea kutumia simu yako, utahitaji urejesha mipangilio ya kiwandani. Utakapowasha simu yako baada ya kurejesha, utakuwa na fursa ya kurejesha data zozote ulizocheleza kwenye Akaunti yako ya Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Badili mbinu ya ingizo"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Mbinu ya kufunga skrini?"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Chagua kifungio cha hifadhi"</string>
@@ -506,6 +506,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Inaunganisha"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Vimeunganishwa"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Inapatikana"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Vinavyotumika"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Onyesha mipangilio"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Kata muunganisho?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Hii itaukata muunganisho wako kwa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -524,7 +525,7 @@
     <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 kimewashwa, unaweza kusambazia kifaa kingine chenye NFC  maudhui ya programu kwa kushika vifaa vyote vikiwa kimekaribiana. Kwa mfano, unaweza kusambaza kurasa za kivinjari, videos za YouTube, anwani za Watu, na mengine. "\n" "\n"Shika vifaa vikiwa vimekaribiana (kawaida pande za nyuma zikiwa zimeangaliana) na kisha uguse skrini yako. Programu huamua cha kusambaza."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Wakati kipengele hiki kimewashwa, unaweza kusambazia kifaa kingine chenye NFC  maudhui ya programu kwa kushika vifaa vyote vikiwa kimekaribiana. Kwa mfano, unaweza kusambaza kurasa za kivinjari, videos za YouTube, anwani za Watu, na mengine. \n \nShika vifaa vikiwa vimekaribiana (kawaida pande za nyuma zikiwa zimeangaliana) na kisha uguse skrini yako. Programu huamua cha kusambaza."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Ugunduzi wa huduma ya mtandao"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Ruhusu programu kwenye vifaa vingine kugundua programu kwenye kifaa hiki"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -612,7 +613,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Umelindwa kwa <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", umelindwa kwa <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Hamna"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Ili kuboresha usahihi wa mahali na kwa madhumuni mengine, <xliff:g id="APP_NAME">%1$s</xliff:g> inataka kuwasha ukaguaji mitandao, hata wakati Wi-Fi imezimwa."\n\n"Je, ungependa kuruhusu programu zote ambazo zingependa kukagua ziweza kufanya hivyo?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Ili kuboresha usahihi wa mahali na kwa madhumuni mengine, <xliff:g id="APP_NAME">%1$s</xliff:g> inataka kuwasha ukaguaji mitandao, hata wakati Wi-Fi imezimwa.\n\nJe, ungependa kuruhusu programu zote ambazo zingependa kukagua ziweza kufanya hivyo?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Ruhusu"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Kataa"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Unganisha"</string>
@@ -624,8 +625,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"ILANI: Huenda ukatozwa gharama ya ziada ya data ya mtoa huduma.\n\nUsanidi wa kompyuta ndogo unaweza kuhitaji huduma muhimu ya mtandao."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ILANI: Huenda ukatozwa gharama ya ziada ya data ya mtoa huduma.\n\nUsanidi wa simu unaweza kuhitaji huduma muhimu ya mtandao."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ILANI:Hadi uwe na muunganisho wa intaneti, kompyuta kibao yako haitaweza kuthibitisha kuwa programu yako imesasishwa."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ILANI: Hadi uwe na muunganisho wa intaneti, simu haitaweza kuthibitisha kuwa programu yako imesasishwa."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Kompyuta ndogo haikuweza kuunganishwa kwenye mtandao huu wa Wi-Fi."</string>
@@ -765,9 +766,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN ya SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN si sahihi!"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN hazilingani"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Hawezi kubadilika PIN. "\n" Inawezekana PIN si sahihi."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Hawezi kubadilika PIN. \n Inawezekana PIN si sahihi."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Umefaulu kubadilisha PIN ya SIM"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Hauwezi kubadilisha hali ya kifungio cha SIM kadi. "\n" Inawezekana PIN si sahihi."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Hauwezi kubadilisha hali ya kifungio cha SIM kadi. \n Inawezekana PIN si sahihi."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Sawa"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Ghairi"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Hali ya kompyuta kibao"</string>
@@ -910,9 +911,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Rejesha data ya kiwandani"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Futa data yote kwenye kompyuta ndoto"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Inafuta data yote katika simu"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Hii itafuta data yote kutoka hifadhi yako iliyo "<b>"ndani ya kompyuta kibao"</b>", pamoja na:"\n" "\n" "<li>" Akaunti yako ya Google"</li>" "\n" "<li>"Data na mipangilio ya mfumo na programu"</li>" "\n" "<li>"Programu zilizopakuliwa"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Hii itafuta data yote kutoka hifadhi yako iliyo "<b>"ndani ya simu"</b>", pamoja na:"\n" "\n" "<li>"Akaunti yako ya Google"</li>" "\n" "<li>"Data na mipangilio ya mfumo na programu"</li>" "\n" "<li>"programu zilizopakuliwa"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kwa sasa umeingia kwenye akaunti zifuatazo:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Hii itafuta data yote kutoka hifadhi yako iliyo "<b>"ndani ya kompyuta kibao"</b>", pamoja na:\n \n "<li>" Akaunti yako ya Google"</li>" \n "<li>"Data na mipangilio ya mfumo na programu"</li>" \n "<li>"Programu zilizopakuliwa"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Hii itafuta data yote kutoka hifadhi yako iliyo "<b>"ndani ya simu"</b>", pamoja na:\n \n "<li>"Akaunti yako ya Google"</li>" \n "<li>"Data na mipangilio ya mfumo na programu"</li>" \n "<li>"programu zilizopakuliwa"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kwa sasa umeingia kwenye akaunti zifuatazo:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muziki"</li>\n<li>"Picha"</li>\n<li>"data nyingine ya mtumiaji"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ili kufuta pia muziki, picha, na data zingine za mtumiaji, "<b>" hifadhi ya "</b>" inahitaji kufutwa."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Ili kufuta muziki, picha, na data zingine za mtumiaji, "<b>"kadi ya"</b>" inahitaji kufutwa."</string>
@@ -1099,7 +1100,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Onyesha michakato iliyoakibishwa"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Weka upya mapendeleo ya programu"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Ungependa kuweka upya mapendeleo ya programu?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Hii itaweka upya mapendeleo yote ya:"\n\n" "<li>"Programu zilizolemazwa"</li>\n" "<li>"Arifa za programu iliyolemazwa"</li>\n" "<li>"Programu chaguo-msingi za vitendo"</li>\n" "<li>"Uzuiaji wa data ya usuli ya programu"</li>\n\n" Hutapoteza data yoyote ya programu."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Hii itaweka upya mapendeleo yote ya:\n\n "<li>"Programu zilizolemazwa"</li>\n" "<li>"Arifa za programu iliyolemazwa"</li>\n" "<li>"Programu chaguo-msingi za vitendo"</li>\n" "<li>"Uzuiaji wa data ya usuli ya programu"</li>\n\n" Hutapoteza data yoyote ya programu."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Weka upya programu"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Dhibiti nafasi"</string>
     <string name="filter" msgid="2018011724373033887">"Kichujio"</string>
@@ -1234,9 +1235,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Ili kubadili, bonyeza Dhibiti-Kiweka nafasi"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Chaguo-msingi"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Mpangilio wa kibodi"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kamusi ya mtumiaji"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Kamusi binafsi"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"kamusi binafsi"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Kamusi binafsi"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Ongeza"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Ongeza kwenye kamusi"</string>
@@ -1297,6 +1296,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Jumuisha chaguo katika menyu ya nguvu kwa kupeleka ripoti ya hitilafu"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Weka skrini ikiwa imewashwa"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skrini haitawahi kuzima wakati unachaji"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Washa kumbukumbu ya Bluetooth HCI Snoop"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Nasa pakiti zote za Bluetooth HCI katika faili"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Chagua muda wa kuendesha"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Chagua muda wa kuendesha"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Fungua upya na ubadilishe muda wa kuendesha kutoka <xliff:g id="OLD">%1$s</xliff:g> hadi <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Ruhusu maeneo ya jaribio"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Ruhusu maeneo ya majaribio"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Ruhusu utatuaji USB?"</string>
@@ -1309,11 +1313,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Linda hifadhi ya USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Sharti programu iombe ruhusa ili kusoma hifadhi ya USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Linda hifadhi ya USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Wakati hifadhi ya USB imelindwa, sharti programu ziombe ruhusa ya kusoma data kutoka kwenye hifadhi ya nje."\n\n"Baadhi ya programu zinawezakosa kufanya kazi hadi zisasishwe na wasanidi wake."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Wakati hifadhi ya USB imelindwa, sharti programu ziombe ruhusa ya kusoma data kutoka kwenye hifadhi ya nje.\n\nBaadhi ya programu zinawezakosa kufanya kazi hadi zisasishwe na wasanidi wake."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Linda kadi ya SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Sharti programu iombe ruhusa ili kusoma kadi ya SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Linda kadi ya SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wakati kadi ya SD imelindwa, sharti programu ziombe ruhusa ya kusoma data kutoka kwenye hifadhi ya nje."\n\n"Baadhi ya programu zinawezakosa kufanya kazi hadi zisasishwe na wasanidi wake."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wakati kadi ya SD imelindwa, sharti programu ziombe ruhusa ya kusoma data kutoka kwenye hifadhi ya nje.\n\nBaadhi ya programu zinawezakosa kufanya kazi hadi zisasishwe na wasanidi wake."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Kituo cha karibu"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Washa programu ya mwisho inayotoa ufikiaji mkuu wa karibu"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Chagua kitufe"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Chagua wijeti"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Unda wijeti na uruhusu ufikiaji?"</string>
@@ -1334,11 +1340,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Huduma"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Mfumo"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Ishara za ukuzaji"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kipengele hiki kinapowashwa, unaweza kukuza na kufifiza kwa kugonga skrini mara tatu."\n\n"Unapokuwa umekuza, unaweza:"\n<ul><li>"Kupindua: Vuta vidole viwili au zaidi kwenye skrini."</li>\n<li>"Rekebisha kiwango cha ukuzaji: Bana vidole viwili au zaidi pamoja au uzitawanye."</li></ul>\n\n"Pia unaweza kukuza hali, unaweza kuvuta kidole chako ili kuchunguza sehemu mbalimbali za skrini. Inua kidole chako ili kurejea kwenye hali yako ya awali."\n\n"Dokezo: Kugonga mara tatu ili kukuza hufanya kazi kila mahali isipokuwa kwenye kibodi na upau wa kubadilisha sehemu za skrini."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kipengele hiki kinapowashwa, unaweza kukuza na kufifiza kwa kugonga skrini mara tatu.\n\nUnapokuwa umekuza, unaweza:\n"<ul><li>"Kupindua: Vuta vidole viwili au zaidi kwenye skrini."</li>\n<li>"Rekebisha kiwango cha ukuzaji: Bana vidole viwili au zaidi pamoja au uzitawanye."</li></ul>\n\n"Pia unaweza kukuza hali, unaweza kuvuta kidole chako ili kuchunguza sehemu mbalimbali za skrini. Inua kidole chako ili kurejea kwenye hali yako ya awali.\n\nDokezo: Kugonga mara tatu ili kukuza hufanya kazi kila mahali isipokuwa kwenye kibodi na upau wa kubadilisha sehemu za skrini."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Njia mkato ya ufikivu"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Imewashwa"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Imezimwa"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kipengele hiki kinapowashwa, unaweza kuwezesha haraka vipengele vya ufikivu kwa hatua mbili:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Kipengele hiki kinapowashwa, unaweza kuwezesha haraka vipengele vya ufikivu kwa hatua mbili:\n\nHatua ya 1: Bonyeza na ushikilie kitufe cha kuwasha/kuzima mpaka utakaposikia sauti au kuhisi mtetemo.\n\nHatua ya 2: Gusa na ushikilie vidole viwili mpaka utakaposikia uthibitishaji wa sauti.\n\nIkiwa kifaa kina watumiaji wengi, kuutumia mkato huu kwenye skrini ya kufunga kunawezesha ufikivu kwa muda mpaka kifaa kitakapofunguliwa."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Maandishi makubwa"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ukuzaji wa skrini"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Sasisha otomatiki ukuzaji wa skrini"</string>
@@ -1360,6 +1366,16 @@
     <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_service_default_description" msgid="1072730037861494125">"Hakuna maelezo yaliyotolewa."</string>
     <string name="settings_button" msgid="3006713718908152930">"Mipangilio"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Kuchapisha"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Mipangilio ya kuchapisha"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Huduma"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Je, ungependa kutumia <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> inaweza kupokea hati unazozichapisha. Hati kama hizo zinaweza kuwa na data nyeti."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Hakuna huduma zilizosakinishwa"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Mipangilio"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Ongeza printa"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Kimewashwa"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Kimezimwa"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Betri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Ni nini kimekuwa kikitumia betri"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Data ya matumizi ya betri haipatikani."</string>
@@ -1399,8 +1415,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Inaendesha Wi-Fi"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Kompyuta kibao"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Simu"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Data imetumwa"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Data iliyopokewa"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Daya ya kifaa cha mkononi imetumwa"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Data ya kifaa cha mkononi imepokelewa"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Data ya Wi‑Fi imetumwa"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Data ya Wi‑Fi imepokelewa"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Kusikika"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Washa saa"</string>
@@ -1454,6 +1472,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Giza"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Huadhiri hali ya maandishi yaliyosemwa"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Lugha"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Lugha haijachaguliwa"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Huweka sauti maalum ya lugha inayolingana na yanayozungumzwa"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Sikiliza mfano"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Cheza onyesho fupi la usanisi usemaji"</string>
@@ -1588,7 +1607,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP haiauniwi."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Huwezi kusanidi muunganisho wa EAP Wi-Fi wakati wa usanidi. Baada ya kusanidi, unaweza kufanya hivyo katika Mipangilio &gt; mitandao isiyotumia waya."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Kuunganisha kunaweza kuchukua dakika chache..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Gusa"<b>"Inayofuata"</b>" ili kuendelea na usanidi."\n\n"Gusa"<b>"Nyuma"</b>" ili kuunganisha kwenye mtandao tofauti wa Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Gusa"<b>"Inayofuata"</b>" ili kuendelea na usanidi.\n\nGusa"<b>"Nyuma"</b>" ili kuunganisha kwenye mtandao tofauti wa Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Kusawazisha kumelemazwa"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Kusawazisha kumelemazwa"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Hitilafu ya usawazishaji."</string>
@@ -1616,7 +1635,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalenda"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Anwani"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Karibu kwa usawazishi wa Google!"</font>" "\n"Njia ya Google ya kusawazisha data ili kuruhusu ufikiaji wa anwani zako, miadi yako, na mengine kutoka mahali popote ulipo."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Karibu kwa usawazishi wa Google!"</font>" \nNjia ya Google ya kusawazisha data ili kuruhusu ufikiaji wa anwani zako, miadi yako, na mengine kutoka mahali popote ulipo."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Mipangilio ya kusawazisha programu"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Usawazishaji data"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Badilisha nenosiri"</string>
@@ -1670,8 +1689,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Tatua uondoaji wa GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Lemaza miekeleo ya HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Daima tumia GPU kwa mchanganyiko wa skrini"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Wezesha ufuatiliaji wa OpenGL"</string>
@@ -1732,11 +1750,11 @@
     <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 programu hii, kwanza weka kikomo cha data ya simu ya mkono."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Zuia data ya mandhari nyuma?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Kipengee hiki kinaweza kusababisha programu inayotegemea data ya usuli kuacha kufanya kazi wakati ni mitandao ya simu tu inayopatikana."\n\n"Unaweza kupata vidhibiti faafu zaidi vya matumizi ya data katika mipangilio inayopatikana ndani ya programu."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Kipengee hiki kinaweza kusababisha programu inayotegemea data ya usuli kuacha kufanya kazi wakati ni mitandao ya simu tu inayopatikana.\n\nUnaweza kupata vidhibiti faafu zaidi vya matumizi ya data katika mipangilio inayopatikana ndani ya programu."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Kuzuia data za usuli inawezekana tu wakati umeweka kikomo cha data ya simu ya mkono."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Je, usawazishaji data kiotomatiki uwashwe?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Mabadiliko yote unayoyafanya katika akaunti zako kwenye wavuti yatanakiliwa kiotomatiki katika kompyuta kibao yako."\n\n"Baadhi ya akaunti pia zinaweza kunakili kiotomatiki mabadiliko yoyote unayoyafanya kwenye kompyuta kibao hadi kwenye wavuti. Akaunti ya Google hufanyakazi kwa namna hii."\n\n"Ili kuchagua ni aina zipi za taarifa za kusawazisha katika kila akaunti, nenda kwenye Mipangilio &gt; Akaunti."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Mabadiliko yote unayoyafanya katika akaunti zako kwenye wavuti yatanakiliwa kiotomatiki katika simu yako."\n\n"Baadhi ya akaunti pia zinaweza kunakili kiotomatiki mabadiliko yoyote unayoyafanya kwenye simu hadi katika wavuti. Akaunti ya Google hufanyakazi kwa namna hii."\n\n"Ili kuchagua aina zipi za taarifa za kusawazisha katika kila akaunti, nenda kwenye Mipangilio &gt; Akaunti."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Mabadiliko yote unayoyafanya katika akaunti zako kwenye wavuti yatanakiliwa kiotomatiki katika kompyuta kibao yako.\n\nBaadhi ya akaunti pia zinaweza kunakili kiotomatiki mabadiliko yoyote unayoyafanya kwenye kompyuta kibao hadi kwenye wavuti. Akaunti ya Google hufanyakazi kwa namna hii.\n\nIli kuchagua ni aina zipi za taarifa za kusawazisha katika kila akaunti, nenda kwenye Mipangilio &gt; Akaunti."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Mabadiliko yote unayoyafanya katika akaunti zako kwenye wavuti yatanakiliwa kiotomatiki katika simu yako.\n\nBaadhi ya akaunti pia zinaweza kunakili kiotomatiki mabadiliko yoyote unayoyafanya kwenye simu hadi katika wavuti. Akaunti ya Google hufanyakazi kwa namna hii.\n\nIli kuchagua aina zipi za taarifa za kusawazisha katika kila akaunti, nenda kwenye Mipangilio &gt; Akaunti."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Je, usawazishaji data kiotomatiki uzimwe?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Hii itahifadhi data na matumizi ya betri, lakini utahitajika kusawazisha kila akaunti wewe mwenyewe ili kukusanya taarifa ya hivi karibuni. Na hutapokea arifa wakati sasisho zinapotokea."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tarehe iliyowekwa upya ya msururu wa matumizi"</string>
@@ -1745,12 +1763,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Weka onyo kwa matumizi ya data"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Weka kikomo cha matumizi ya data"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"inapunguza matumizi ya data"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Muunganisho wako wa data ya simu utalemazwa wakati kiwango fulani kitafikiwa. "\n\n" Kwa kuwa matumizi ya data yanapimwa na kompyuta kibao yako, na mtoa huduma wako anaweza kuhesabu matumizi kwa njia tofauti, zingatia kutumia kiwango cha kutunza."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Muunganisho wako wa data ya simu utalemazwa wakati kiwango kilichobainishwa kitafikiwa. "\n\n" Kwa kuwa matumizi ya data yanapimwa na simu yako, na mtoa huduma wako anaweza kuhesabu matumizi kwa njia tofauti, zingatia kutumia kiwango cha kutunza."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Muunganisho wako wa data ya simu utalemazwa wakati kiwango fulani kitafikiwa. \n\n Kwa kuwa matumizi ya data yanapimwa na kompyuta kibao yako, na mtoa huduma wako anaweza kuhesabu matumizi kwa njia tofauti, zingatia kutumia kiwango cha kutunza."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Muunganisho wako wa data ya simu utalemazwa wakati kiwango kilichobainishwa kitafikiwa. \n\n Kwa kuwa matumizi ya data yanapimwa na simu yako, na mtoa huduma wako anaweza kuhesabu matumizi kwa njia tofauti, zingatia kutumia kiwango cha kutunza."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Zuia data ya mandhari nyuma?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Ukizuia data ya chini kwa chini ya vifaa vya mkononi, baadhi ya programu na huduma hazitafanya kazi mpaka uunganishe mtandao wa Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ukizuia data ya chini kwa chini kwa vifaa vya mkonon, baadhi ya programu na huduma hazitafanya kazi isipokuwa uunganishwe kwenye mtandao wa Wi-Fi."\n\n"Mpangilio huu unawaathiri watumiaji wote kwenye kompyuta hii ndogo."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ukizuia data ya chini kwa chini kwa vifaa vya mkononi, baadhi ya programu na huduma hazitafanya kazi isipokuwa uunganishwe kwenye mtandao wa Wi-Fi."\n\n"Mpangilio huu unawaathiri watumiaji wote kwenye simu hii."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ukizuia data ya chini kwa chini kwa vifaa vya mkonon, baadhi ya programu na huduma hazitafanya kazi isipokuwa uunganishwe kwenye mtandao wa Wi-Fi.\n\nMpangilio huu unawaathiri watumiaji wote kwenye kompyuta hii ndogo."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ukizuia data ya chini kwa chini kwa vifaa vya mkononi, baadhi ya programu na huduma hazitafanya kazi isipokuwa uunganishwe kwenye mtandao wa Wi-Fi.\n\nMpangilio huu unawaathiri watumiaji wote kwenye simu hii."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"onyo"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"kiwango"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Programu zilizoondolewa"</string>
@@ -1837,8 +1855,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Mtumiaji"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Wasifu uliozuiwa"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Ongeza mtumiaji mpya"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Unaweza kushiriki kifaa hiki na watu wengine kwa kuweka watumiaji wa ziada. Kila mtumiaji ana nafasi yake binafsi, ambayo anaweza kugeuza kumfaa kwa programu binafsi, pazia, na kadhalika. Watumiaji pia wanaweza kurekebisha mipangilio ya kompyuta ndogo kama Wi-Fi ambayo inaathiri kila mtu."\n\n"Baada ya kuweka mtumiaji mpya, mtu huyo anahitaji kupitia mchakato wa usanidi."\n\n"Mtumiaji yeyote anaweza kukubali idhini zilizosasishwa za programu kwa niaba ya watumiaji wengine wote."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"Baada ya kuweka mtumiaji mpya, mtu huyo anahitaji kupitia mchakato wa usanidi."\n\n"Mtumiaji yeyote anaweza kukubali ruhusa zilizosasishwa za programu kwa niaba ya watumiaji wengine wote."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Unaweza kushiriki kifaa hiki na watu wengine kwa kuweka watumiaji wa ziada. Kila mtumiaji ana nafasi yake binafsi, ambayo anaweza kugeuza kumfaa kwa programu binafsi, pazia, na kadhalika. Watumiaji pia wanaweza kurekebisha mipangilio ya kompyuta ndogo kama Wi-Fi ambayo inaathiri kila mtu.\n\nBaada ya kuweka mtumiaji mpya, mtu huyo anahitaji kupitia mchakato wa usanidi.\n\nMtumiaji yeyote anaweza kukubali idhini zilizosasishwa za programu kwa niaba ya watumiaji wengine wote."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Baada ya kuweka mtumiaji mpya, mtu huyo anahitaji kupitia mchakato wa usanidi.\n\nMtumiaji yeyote anaweza kukubali ruhusa zilizosasishwa za programu kwa niaba ya watumiaji wengine wote."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Sandi mtumiaji sasa?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Hakikisha kuwa mtu wa kuchukua kompyuta ndogo na kusanidi nafasi yake yupo"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Ungependa kuweka wasifu sasa?"</string>
@@ -1869,6 +1887,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Mpangilio huu unaathiri watumiaji wote kwenye simu hii."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Badilisha lugha"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Badilisha ukubwa wa fonti"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Vikwazo"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Ondoa vikwazo"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Badilisha PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Onyesha arifa"</string>
     <string name="help_label" msgid="1107174367904110532">"Usaidizi"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Akaunti ya maudhui"</string>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 1374efdcbcd..4f4a221876b 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -24,7 +24,7 @@
     <dimen name="content_margin_left">16dip</dimen>
     <dimen name="description_margin_top">26dip</dimen>
     <dimen name="crypt_clock_size">120sp</dimen>
-    <dimen name="setup_title_size">60sp</dimen>
+    <dimen name="setup_title_size">60dp</dimen>
     <item type="dimen" name="setup_title_height">20%</item>
     <item type="dimen" name="setup_border_width">10%</item>
     <dimen name="setup_margin_bottom">0dip</dimen>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 9f02164506d..6862690ac5a 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -44,6 +44,13 @@
         <item name="android:textSize">18sp</item>
     </style>
 
+    <style name="wifi_item_edit_content">
+        <item name="android:layout_width">0dip</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">7</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
     <style name="wifi_section">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
@@ -61,4 +68,5 @@
     <style name="KeyguardAppWidgetItem">
         <item name="android:textSize">16sp</item>
     </style>
+
 </resources>
diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
new file mode 100644
index 00000000000..05914dfe0e3
--- /dev/null
+++ b/res/values-sw720dp-land/dimens.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <dimen name="settings_side_margin">150dp</dimen>
+</resources>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index d6d91840eb7..9c6cc250b06 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -15,8 +15,9 @@
 -->
 
 <resources>
-    <dimen name="pager_tabs_padding">@*android:dimen/preference_fragment_padding_side</dimen>
+    <dimen name="pager_tabs_padding">0dp</dimen>
     <dimen name="appwidget_preview_height">80dip</dimen>
     <integer name="keyguard_appwidget_picker_cols">2</integer>
     <dimen name="keyguard_appwidget_picker_width">720dip</dimen>
+    <dimen name="settings_side_margin">32dp</dimen>
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 324463daec2..1a68c7120a8 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"ตำแหน่งที่ตั้ง"</item>
     <item msgid="255608127647030286">"ส่วนตัว"</item>
     <item msgid="4588829735729884491">"การรับส่งข้อความ"</item>
-    <item msgid="8971765125227378270">"อุปกรณ์"</item>
+    <item msgid="886742181977884584">"สื่อ"</item>
+    <item msgid="7924928667052300589">"อุปกรณ์"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"ตำแหน่งคร่าวๆ"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"เล่นเสียง"</item>
     <item msgid="8374996688066472414">"อ่านคลิปบอร์ด"</item>
     <item msgid="3045529469061083747">"แก้ไขคลิปบอร์ด"</item>
+    <item msgid="5124443975763747838">"ปุ่มสื่อ"</item>
+    <item msgid="4547883971364273343">"โฟกัสอัตโนมัติ"</item>
+    <item msgid="2603878814882344450">"ระดับเสียงหลัก"</item>
+    <item msgid="7136963238377062018">"ระดับเสียงสนทนา"</item>
+    <item msgid="4270236897655923007">"ระดับเสียงเรียกเข้า"</item>
+    <item msgid="6325739889222559394">"ระดับเสียงของสื่อ"</item>
+    <item msgid="5762123934816216821">"ระดับเสียงปลุก"</item>
+    <item msgid="785049718065337473">"ระดับเสียงการแจ้งเตือน"</item>
+    <item msgid="6700305533746877052">"ระดับเสียงบลูทูธ"</item>
+    <item msgid="2029227495214047094">"ทำงานตลอดเวลา"</item>
+    <item msgid="26109888160231211">"ตำแหน่งจอภาพ"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"ตำแหน่ง"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"เล่นเสียง"</item>
     <item msgid="136815868796597058">"อ่านคลิปบอร์ด"</item>
     <item msgid="5238692940326972503">"แก้ไขคลิปบอร์ด"</item>
+    <item msgid="5753789168376302997">"ปุ่มสื่อ"</item>
+    <item msgid="3265262911688671938">"โฟกัสอัตโนมัติ"</item>
+    <item msgid="2098976479485046797">"ระดับเสียงหลัก"</item>
+    <item msgid="5660213838861789350">"ระดับเสียงสนทนา"</item>
+    <item msgid="7983336752371254444">"ระดับเสียงเรียกเข้า"</item>
+    <item msgid="7878027809189330917">"ระดับเสียงของสื่อ"</item>
+    <item msgid="7260546305036218513">"ระดับเสียงปลุก"</item>
+    <item msgid="9103719301075748925">"ระดับเสียงของการแจ้งเตือน"</item>
+    <item msgid="7025966722295861512">"ระดับบลูทูธ"</item>
+    <item msgid="4665183401128289653">"ทำงานตลอดเวลา"</item>
+    <item msgid="8584357129746649222">"ตำแหน่ง"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"สั้น"</item>
     <item msgid="2560532955514699713">"ปานกลาง"</item>
     <item msgid="2372711992605524591">"ยาว"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (ดีบัก)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"ใช้ Dalvik"</item>
+    <item msgid="5131846588686178907">"ใช้ ART"</item>
+    <item msgid="4530003713865319928">"ใช้บิวด์ดีบัก ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"ไม่ต้องตรวจสอบ"</item>
     <item msgid="6042769699089883931">"ตรวจสอบเนื้อหา DRM เท่านั้น"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"เป็นเส้นบนหน้าจอ"</item>
     <item msgid="120512413928262547">"ใน adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"ปิด"</item>
+    <item msgid="7688197031296835369">"แสดงพื้นที่การวาดทับ"</item>
+    <item msgid="8332661909019981149">"แสดงตัวนับการวาดทับ"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"ขีดจำกัดมาตรฐาน"</item>
     <item msgid="4071574792028999443">"ไม่มีกระบวนการพื้นหลัง"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 719ee1042a9..844c428eea6 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -275,8 +275,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_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>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"จำเป็นต้องใช้ PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสแท็บเล็ตของคุณทุกครั้งที่คุณเปิดเครื่อง"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"จำเป็นต้องใช้ PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสโทรศัพท์ของคุณทุกครั้งที่คุณเปิดเครื่อง"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"ที่เข้ารหัส"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมาและข้อมูล สื่อ และไฟล์อื่นๆ ของแอปพลิเคชันนั้นได้ เมื่อคุณเข้ารหัสแท็บเล็ตแล้ว คุณจะต้องพิมพ์รหัส PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสในแต่ละครั้งที่คุณเปิดเครื่อง คุณไม่สามารถถอดรหัสแท็บเล็ตได้เว้นแต่จะทำการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะเป็นการลบข้อมูลทั้งหมด"\n\n"การเข้ารหัสใช้เวลาอย่างน้อยหนึ่งชั่วโมง คุณต้องเริ่มต้นด้วยการใช้แบตเตอรี่ที่ชาร์จไฟแล้วและเสียบปลั๊กแท็บเล็ตไว้จนกว่าการเข้ารหัสจะเสร็จสมบูรณ์ หากมีการขัดจังหวะกระบวนการเข้ารหัส คุณจะสูญเสียข้อมูลบางส่วนหรือทั้งหมดไป"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมาและข้อมูล สื่อ และไฟล์อื่นๆ ของแอปพลิเคชันนั้นได้ เมื่อคุณเข้ารหัสโทรศัพท์แล้ว คุณจะต้องพิมพ์รหัส PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสในแต่ละครั้งที่คุณเปิดเครื่อง คุณไม่สามารถถอดรหัสโทรศัพท์ได้เว้นแต่จะรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะเป็นการลบข้อมูลทั้งหมด"\n\n"การเข้ารหัสใช้เวลาอย่างน้อยหนึ่งชั่วโมง คุณต้องเริ่มต้นด้วยการใช้แบตเตอรี่ที่ชาร์จไฟแล้วและเสียบปลั๊กโทรศัพท์ไว้จนกว่าการเข้ารหัสจะเสร็จสมบูรณ์ หากมีการขัดจังหวะกระบวนการเข้ารหัส คุณจะสูญเสียข้อมูลบางส่วนหรือทั้งหมดไป"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมาและข้อมูล สื่อ และไฟล์อื่นๆ ของแอปพลิเคชันนั้นได้ เมื่อคุณเข้ารหัสแท็บเล็ตแล้ว คุณจะต้องพิมพ์รหัส PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสในแต่ละครั้งที่คุณเปิดเครื่อง คุณไม่สามารถถอดรหัสแท็บเล็ตได้เว้นแต่จะทำการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะเป็นการลบข้อมูลทั้งหมด\n\nการเข้ารหัสใช้เวลาอย่างน้อยหนึ่งชั่วโมง คุณต้องเริ่มต้นด้วยการใช้แบตเตอรี่ที่ชาร์จไฟแล้วและเสียบปลั๊กแท็บเล็ตไว้จนกว่าการเข้ารหัสจะเสร็จสมบูรณ์ หากมีการขัดจังหวะกระบวนการเข้ารหัส คุณจะสูญเสียข้อมูลบางส่วนหรือทั้งหมดไป"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมาและข้อมูล สื่อ และไฟล์อื่นๆ ของแอปพลิเคชันนั้นได้ เมื่อคุณเข้ารหัสโทรศัพท์แล้ว คุณจะต้องพิมพ์รหัส PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสในแต่ละครั้งที่คุณเปิดเครื่อง คุณไม่สามารถถอดรหัสโทรศัพท์ได้เว้นแต่จะรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะเป็นการลบข้อมูลทั้งหมด\n\nการเข้ารหัสใช้เวลาอย่างน้อยหนึ่งชั่วโมง คุณต้องเริ่มต้นด้วยการใช้แบตเตอรี่ที่ชาร์จไฟแล้วและเสียบปลั๊กโทรศัพท์ไว้จนกว่าการเข้ารหัสจะเสร็จสมบูรณ์ หากมีการขัดจังหวะกระบวนการเข้ารหัส คุณจะสูญเสียข้อมูลบางส่วนหรือทั้งหมดไป"</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"เข้ารหัสแท็บเล็ต"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"เข้ารหัสโทรศัพท์"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"ชาร์จแบตเตอรี่และลองอีกครั้ง"</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"ลองใหม่อีกครั้งใน <xliff:g id="DELAY">^1</xliff:g> วินาที"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"พิมพ์รหัสผ่านของคุณ"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"การเข้ารหัสไม่สำเร็จ"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"การเข้ารหัสถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น คุณจึงไม่สามารถเข้าถึงข้อมูลในแท็บเล็ตได้อีกต่อไป"\n\n"ในการใช้งานแท็บเล็ตต่อ คุณต้องรีเซ็ตข้อมูลเป็นค่าเริ่มต้น เมื่อคุณตั้งค่าแท็บเล็ตหลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"การเข้ารหัสถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น คุณจึงไม่สามารถเข้าถึงข้อมูลในโทรศัพท์ได้อีกต่อไป"\n\n"ในการใช้งานโทรศัพท์ต่อ คุณต้องรีเซ็ตข้อมูลเป็นค่าเริ่มต้น เมื่อคุณตั้งค่าโทรศัพท์หลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"การเข้ารหัสถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น คุณจึงไม่สามารถเข้าถึงข้อมูลในแท็บเล็ตได้อีกต่อไป\n\nในการใช้งานแท็บเล็ตต่อ คุณต้องรีเซ็ตข้อมูลเป็นค่าเริ่มต้น เมื่อคุณตั้งค่าแท็บเล็ตหลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"การเข้ารหัสถูกขัดจังหวะและไม่สามารถดำเนินการให้เสร็จสิ้น คุณจึงไม่สามารถเข้าถึงข้อมูลในโทรศัพท์ได้อีกต่อไป\n\nในการใช้งานโทรศัพท์ต่อ คุณต้องรีเซ็ตข้อมูลเป็นค่าเริ่มต้น เมื่อคุณตั้งค่าโทรศัพท์หลังจากรีเซ็ตแล้ว คุณจะสามารถกู้คืนข้อมูลทั้งหมดที่มีการสำรองไว้ในบัญชี Google ของคุณได้"</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"สลับวิธีการป้อนข้อมูล"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"เลือกการล็อกหน้าจอ"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"เลือกการล็อกข้อมูลสำรอง"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"กำลังเชื่อมต่อ"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"เชื่อมต่อแล้ว"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"มีอยู่"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"กำลังใช้งาน"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"การตั้งค่าการแสดงผล"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"หากต้องการตัดการเชื่อมต่อ"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"การทำเช่นนี้จะยุติการเชื่อมต่อของคุณกับ :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,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, ที่อยู่ติดต่อใน People และอื่นๆ"\n\n"เพียงแค่นำอุปกรณ์มาไว้ใกล้กัน (โดยปกติจะให้ด้านหลังชนกัน) จากนั้นแตะที่หน้าจอ แอปพลิเคชันจะตัดสินใจว่าจะรับคลื่นสัญญาณสำหรับสิ่งใด"</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"เมื่อคุณลักษณะนี้เปิดอยู่ คุณสามารถส่งคลื่นสัญญาณของเนื้อหาของแอปพลิเคชันไปยังอุปกรณ์ที่สามารถใช้ NFC อีกอุปกรณ์หนึ่งได้โดยถืออุปกรณ์ไว้ใกล้กัน ตัวอย่างเช่น คุณสามารถส่งคลื่นสัญญาณของหน้าเบราว์เซอร์, วิดีโอ YouTube, ที่อยู่ติดต่อใน People และอื่นๆ\n\nเพียงแค่นำอุปกรณ์มาไว้ใกล้กัน (โดยปกติจะให้ด้านหลังชนกัน) จากนั้นแตะที่หน้าจอ แอปพลิเคชันจะตัดสินใจว่าจะรับคลื่นสัญญาณสำหรับสิ่งใด"</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"การค้นหาบริการเครือข่าย"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"อนุญาตให้แอปพลิเคชันบนอุปกรณ์อื่นๆ สามารถค้นหาแอปพลิเคชันบนอุปกรณ์นี้ได้"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"WiFi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"ป้องกันด้วย <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">" ป้องกันด้วย <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"ไม่มี"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"เพื่อปรับปรุงความแม่นยำของตำแหน่ง และเพื่อวัตถุประสงค์อื่น ๆ <xliff:g id="APP_NAME">%1$s</xliff:g> ต้องการเปิดการสแกนเครือข่าย แม้ในขณะที่ไม่มี WiFi "\n" "\n" อนุญาตให้ดำเนินการนี้สำหรับแอปทั้งหมดที่ต้องการสแกนหรือไม่"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"เพื่อปรับปรุงความแม่นยำของตำแหน่ง และเพื่อวัตถุประสงค์อื่น ๆ <xliff:g id="APP_NAME">%1$s</xliff:g> ต้องการเปิดการสแกนเครือข่าย แม้ในขณะที่ไม่มี WiFi \n \n อนุญาตให้ดำเนินการนี้สำหรับแอปทั้งหมดที่ต้องการสแกนหรือไม่"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"อนุญาต"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"ปฏิเสธ"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"เชื่อมต่อ"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"คำเตือน: การดำเนินการของคุณอาจมีค่าบริการเพิ่มเติมจากการใช้ข้อมูลของผู้ให้บริการ\n\nการตั้งค่าแท็บเล็ตอาจต้องใช้กิจกรรมเครือข่ายที่ใช้ปริมาณข้อมูลสูง"</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"คำเตือน: การดำเนินการของคุณอาจมีค่าบริการเพิ่มเติมจากการใช้ข้อมูลของผู้ให้บริการ\n\nการตั้งค่าโทรศัพท์อาจต้องใช้กิจกรรมเครือข่ายที่ใ้ช้ปริมาณข้อมูลสูง"</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"คำเตือน: แท็บเล็ตจะไม่สามารถยืนยันได้ว่าซอฟต์แวร์ของคุณล่าสุดหรือไม่จนกว่าคุณจะมีการเชื่อมต่ออินเทอร์เน็ต"</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"คำเตือน: โทรศัพท์จะไม่สามารถยืนยันได้ว่าซอฟต์แวร์ของคุณล่าสุดหรือไม่จนกว่าคุณจะมีการเชื่อมต่ออินเทอร์เน็ต"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"แท็บเล็ตไม่สามารถเชื่อมต่อกับเครือข่าย WiFi นี้"</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN ของซิม"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN ไม่ถูกต้อง"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN ไม่ตรงกัน"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"ไม่สามารถเปลี่ยน PIN"\n"PIN อาจไม่ถูกต้อง"</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"ไม่สามารถเปลี่ยน PIN\nPIN อาจไม่ถูกต้อง"</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"เปลี่ยนซิม PIN สำเร็จแล้ว"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"เปลี่ยนสถานะการล็อกซิมการ์ดไม่ได้"\n"PIN อาจไม่ถูกต้อง"</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"เปลี่ยนสถานะการล็อกซิมการ์ดไม่ได้\nPIN อาจไม่ถูกต้อง"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"ตกลง"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ยกเลิก"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"สถานะแท็บเล็ต"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"รีเซ็ตข้อมูลเป็นค่าเริ่มต้น"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"ลบข้อมูลทั้งหมดบนแท็บเล็ต"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"ลบข้อมูลทั้งหมดบนโทรศัพท์"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"ของแท็บเล็ตของคุณ ซึ่งประกอบด้วย"\n\n<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลด"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"ของโทรศัพท์ของคุณ ซึ่งประกอบด้วย"\n\n<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลด"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ขณะนี้คุณได้ลงชื่อเข้าใช้บัญชีต่อไปนี้แล้ว:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"ของแท็บเล็ตของคุณ ซึ่งประกอบด้วย\n\n"<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลด"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"ของโทรศัพท์ของคุณ ซึ่งประกอบด้วย\n\n"<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอปพลิเคชัน"</li>\n<li>"แอปพลิเคชันที่ดาวน์โหลด"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ขณะนี้คุณได้ลงชื่อเข้าใช้บัญชีต่อไปนี้แล้ว:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"เพลง"</li>\n<li>"รูปภาพ"</li>\n<li>"ข้อมูลผู้ใช้อื่นๆ"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"หากต้องการล้างข้อมูลเพลง รูปภาพ และข้อมูลผู้ใช้อื่นๆ จะต้องลบ"<b>"ที่จัดเก็บข้อมูล USB"</b></string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"หากต้องการล้างข้อมูลเพลง รูปภาพ และข้อมูลผู้ใช้อื่นๆ คุณต้องลบ"<b>"การ์ด SD"</b></string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"แสดงกระบวนการที่เก็บแคชไว้"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"รีเซ็ตค่ากำหนดแอปพลิเคชัน"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"รีเซ็ตค่ากำหนดแอปหรือไม่"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"คำสั่งนี้จะรีเซ็ตค่ากำหนดทั้งหมดของ:"\n\n<li>"แอปพลิเคชันที่ปิดใช้งาน"</li>\n<li>"การแจ้งเตือนของแอปพลิเคชันที่ปิดใช้งาน"</li>\n<li>"แอปพลิเคชันเริ่มต้นที่จะใช้งาน"</li>\n<li>"ข้อจำกัดของข้อมูลแบ็กกราวด์เกี่ยวกับการใช้แอปพลิเคชัน"</li>\n\n"ข้อมูลแอปพลิเคชันทั้งหมดของคุณจะยังคงอยู่เหมือนเดิม"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"คำสั่งนี้จะรีเซ็ตค่ากำหนดทั้งหมดของ:\n\n"<li>"แอปพลิเคชันที่ปิดใช้งาน"</li>\n<li>"การแจ้งเตือนของแอปพลิเคชันที่ปิดใช้งาน"</li>\n<li>"แอปพลิเคชันเริ่มต้นที่จะใช้งาน"</li>\n<li>"ข้อจำกัดของข้อมูลแบ็กกราวด์เกี่ยวกับการใช้แอปพลิเคชัน"</li>\n\n"ข้อมูลแอปพลิเคชันทั้งหมดของคุณจะยังคงอยู่เหมือนเดิม"</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"รีเซ็ตแอปพลิเคชัน"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"จัดการพื้นที่"</string>
     <string name="filter" msgid="2018011724373033887">"ตัวกรอง"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"หากต้องการสลับ กด Control-Spacebar"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"ค่าเริ่มต้น"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"รูปแบบแป้นพิมพ์"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"พจนานุกรมของผู้ใช้"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"พจนานุกรมส่วนบุคคล"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"พจนานุกรมส่วนบุคคล"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"พจนานุกรมส่วนตัว"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"เพิ่ม"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"เพิ่มลงในพจนานุกรม"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"เพิ่มตัวเลือกในเมนูเปิดปิดสำหรับการใช้รายงานบั๊ก"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"เปิดหน้าจอค้าง"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"หน้าจอจะไม่เข้าสู่โหมดสลีปขณะชาร์จ"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"เปิดใช้งานบันทึกสอดแนมบลูทูธ HCI"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"บันทึกแพ็คเก็ตบลูทูธ HCI ทั้งหมดในไฟล์"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"เลือกรันไทม์"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"เลือกรันไทม์"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"รีบูตเพื่อเปลี่ยนรันไทม์จาก <xliff:g id="OLD">%1$s</xliff:g> เป็น <xliff:g id="NEW">%2$s</xliff:g> ไหม"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"อนุญาตให้จำลองตำแหน่ง"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"อนุญาตให้จำลองตำแหน่ง"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"อนุญาตให้แก้ไขข้อบกพร่อง USB หรือไม่"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"ปกป้องที่จัดเก็บข้อมูล USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"แอปพลิเคชันต้องขออนุญาตในการอ่านที่จัดเก็บข้อมูล USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"ปกป้อง USB หรือไม่"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"เมื่อที่จัดเก็บข้อมูล USB ได้รับการปกป้อง แอปพลิเคชันจะต้องขออนุญาตในการอ่านข้อมูลจากที่จัดเก็บข้อมูลภายนอก"\n\n"แอปพลิเคชันบางรายการอาจไม่ทำงานจนกว่าจะได้รับการอัปเดตโดยนักพัฒนาซอฟต์แวร์ของแอปพลิเคชันนั้นๆ"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"เมื่อที่จัดเก็บข้อมูล USB ได้รับการปกป้อง แอปพลิเคชันจะต้องขออนุญาตในการอ่านข้อมูลจากที่จัดเก็บข้อมูลภายนอก\n\nแอปพลิเคชันบางรายการอาจไม่ทำงานจนกว่าจะได้รับการอัปเดตโดยนักพัฒนาซอฟต์แวร์ของแอปพลิเคชันนั้นๆ"</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"ปกป้องการ์ด SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"แอปพลิเคชันต้องขออนุญาตในการอ่านการ์ด SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"ปกป้องการ์ด SD หรือไม่"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"เมื่อการ์ด SD ได้รับการปกป้อง แอปพลิเคชันจะต้องขออนุญาตในการอ่านข้อมูลจากที่จัดเก็บข้อมูลภายนอก"\n\n"แอปพลิเคชันบางรายการอาจไม่ทำงานจนกว่าจะได้รับการอัปเดตโดยนักพัฒนาซอฟต์แวร์ของแอปพลิเคชันนั้นๆ"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"เมื่อการ์ด SD ได้รับการปกป้อง แอปพลิเคชันจะต้องขออนุญาตในการอ่านข้อมูลจากที่จัดเก็บข้อมูลภายนอก\n\nแอปพลิเคชันบางรายการอาจไม่ทำงานจนกว่าจะได้รับการอัปเดตโดยนักพัฒนาซอฟต์แวร์ของแอปพลิเคชันนั้นๆ"</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"เทอร์มินัลในตัวเครื่อง"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"เปิดใช้งานแอปเทอร์มินัลที่ให้การเข้าถึงเชลล์ในตัวเครื่อง"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"เลือกแกดเจ็ต"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"เลือกวิดเจ็ต"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"สร้างวิดเจ็ตและอนุญาตการเข้าถึงหรือไม่"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"บริการ"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"ระบบ"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"ท่าทางสัมผัสการขยาย"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"เมื่อเปิดคุณลักษณะนี้ คุณสามารถย่อและขยายด้วยการแตะสามครั้งบนหน้าจอ"\n\n"ขณะที่ขยายอยู่ คุณสามารถ:"\n<ul><li>"แพน: ใช้อย่างน้อยสองนิ้วลากผ่านหน้าจอ"</li>\n<li>"ปรับระดับการย่อ/ขยาย: บีบหรือแยกอย่างน้อยสองนิ้วเพื่อปรับระดับ"</li></ul>\n\n"คุณยังสามารถขยายสิ่งที่นิ้วคุณแตะอยู่ชั่วคราวได้ด้วยการแตะสามครั้งค้างไว้ เมื่อขยายแล้ว คุณสามารถใช้นิ้วลากเพื่อดูส่วนต่างๆ ของหน้าจอได้ด้วย ยกนิ้วขึ้นเพื่อกลับไปยังสถานะก่อนหน้า"\n\n"หมายเหตุ: การแตะสามครั้งเพื่อขยายใช้ได้กับทุกส่วนยกเว้นแป้นพิมพ์และแถบนำทาง"</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_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>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack มีการตอบสนองด้วยเสียงเพื่อช่วยเหลือผู้พิการทางสายตาและผู้มีปัญหาทางสายตา คุณต้องการติดตั้งแอปพลิเคชันฟรีนี้จาก Android Market หรือไม่"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"ไม่มีคำอธิบาย"</string>
     <string name="settings_button" msgid="3006713718908152930">"การตั้งค่า"</string>
+    <string name="print_settings" msgid="4742428530112487843">"การพิมพ์"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"การตั้งค่าการพิมพ์"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"บริการ"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"ใช้ <xliff:g id="SERVICE">%1$s</xliff:g> หรือไม่"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> สามารถรับเอกสารที่คุณพิมพ์ เอกสารดังกล่าวอาจมีข้อมูลละเอียดอ่อน"</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"ไม่ได้ติดตั้งบริการใดไว้"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"การตั้งค่า"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"เพิ่มเครื่องพิมพ์"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"เปิด"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"ปิด"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"แบตเตอรี่"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"อะไรที่ใช้งานแบตเตอรี่อยู่"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"ไม่มีข้อมูลการใช้แบตเตอรี่"</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"การใช้งาน WiFi"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"แท็บเล็ต"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"โทรศัพท์"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"ส่งข้อมูลแล้ว"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"ข้อมูลที่ได้รับ"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"ข้อมูลมือถือที่ส่ง"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"ข้อมูลมือถือที่ได้รับ"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"ข้อมูล WiFi ที่ส่ง"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"ข้อมูล WiFi ที่ได้รับ"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"เสียง"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"วิดีโอ"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"เมื่อเวลา"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"ความสูง-ต่ำของเสียง"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"มีผลต่อโทนเสียงของข้อความที่พูด"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"ภาษา"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"ไม่ได้เลือกภาษา"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"ตั้งค่าเสียงในภาษาที่ระบุสำหรับข้อความที่ได้ยิน"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"ฟังตัวอย่าง"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"เล่นการสาธิตสั้นๆ เกี่ยวกับการสังเคราะห์เสียง"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"ไม่สนับสนุน EAP"</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"คุณไม่สามารถกำหนดค่าการเชื่อมต่อ EAP WiFi ในขณะตั้งค่าได้ หลังจากการตั้งค่า คุณสามารถกำหนดค่าการเชื่อมต่อนี้ได้ในการตั้งค่า &gt; ระบบไร้สายและเครือข่าย"</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"การเชื่อมต่ออาจใช้เวลาสักครู่..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"แตะ "<b>"ถัดไป"</b>" เพื่อตั้งค่าต่อไป"\n\n"แตะ "<b>"ย้อนกลับ"</b>" เพื่อเชื่อมต่อกับเครือข่าย WiFi อื่น"</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"แตะ "<b>"ถัดไป"</b>" เพื่อตั้งค่าต่อไป\n\nแตะ "<b>"ย้อนกลับ"</b>" เพื่อเชื่อมต่อกับเครือข่าย WiFi อื่น"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"เปิดใช้งานการซิงค์แล้ว"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"ปิดใช้งานการซิงค์แล้ว"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"ข้อผิดพลาดในการซิงค์"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"ดีบักการวาดทับ GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"ปิดใช้งานการวางซ้อน HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"ใช้ GPU ในการจัดวางองค์ประกอบหน้าจอเสมอ"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"เปิดใช้ร่องรอยใน OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"ปิดใช้งานข้อมูลแบ็กกราวด์บนเครือข่ายมือถือ จะใช้เครือข่ายอื่นหากมี"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"ในการจำกัดข้อมูลแบ็กกราวด์ในแอปฯ ให้ตั้งขีดจำกัดข้อมูลมือถือก่อน"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"ต้องการจำกัดข้อมูลแบ็กกราวด์หรือไม่"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"คุณลักษณะนี้อาจทำให้แอปพลิเคชันที่ต้องอาศัยข้อมูลแบ็กกราวด์หยุดทำงานเมื่อมีแต่เครือข่ายมือถือเท่านั้นที่ใช้งานได้"\n\n"คุณสามารถดูการควบคุมการใช้งานข้อมูลที่เหมาะสมกว่านี้ได้ในการตั้งค่าที่มีอยู่ภายในแอปพลิเคชัน"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"คุณลักษณะนี้อาจทำให้แอปพลิเคชันที่ต้องอาศัยข้อมูลแบ็กกราวด์หยุดทำงานเมื่อมีแต่เครือข่ายมือถือเท่านั้นที่ใช้งานได้\n\nคุณสามารถดูการควบคุมการใช้งานข้อมูลที่เหมาะสมกว่านี้ได้ในการตั้งค่าที่มีอยู่ภายในแอปพลิเคชัน"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"การจำกัดข้อมูลแบ็กกราวด์ทำได้เมื่อคุณได้ตั้งค่าขีดจำกัดข้อมูลมือถือไว้เท่านั้น"</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"เปิดซิงค์ข้อมูลอัตโนมัติหรือไม่"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"การเปลี่ยนแปลงใดๆ ที่คุณทำกับบัญชีของคุณบนเว็บจะถูกคัดลอกไปยังแท็บเล็ตของคุณโดยอัตโนมัติ"\n\n"บางบัญชีอาจคัดลอกการเปลี่ยนแปลงทั้งหมดที่คุณดำเนินการบนแท็บเล็ตไปยังเว็บโดยอัตโนมัติ บัญชี Google ทำงานเช่นนี้"\n\n"หากต้องการเลือกว่าจะซิงค์ข้อมูลชนิดใดภายในแต่ละบัญชี ให้ไปที่การตั้งค่า &gt; บัญชี"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"การเปลี่ยนแปลงใดๆ ที่คุณทำกับบัญชีของคุณบนเว็บจะถูกคัดลอกไปยังโทรศัพท์ของคุณโดยอัตโนมัติ"\n\n"บางบัญชีอาจคัดลอกการเปลี่ยนแปลงทั้งหมดที่คุณดำเนินการบนโทรศัพท์ไปยังเว็บโดยอัตโนมัติ บัญชี Google ทำงานเช่นนี้"\n\n"หากต้องการเลือกว่าจะซิงค์ข้อมูลชนิดใดภายในแต่ละบัญชี ให้ไปที่การตั้งค่า &gt; บัญชี"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"การเปลี่ยนแปลงใดๆ ที่คุณทำกับบัญชีของคุณบนเว็บจะถูกคัดลอกไปยังแท็บเล็ตของคุณโดยอัตโนมัติ\n\nบางบัญชีอาจคัดลอกการเปลี่ยนแปลงทั้งหมดที่คุณดำเนินการบนแท็บเล็ตไปยังเว็บโดยอัตโนมัติ บัญชี Google ทำงานเช่นนี้\n\nหากต้องการเลือกว่าจะซิงค์ข้อมูลชนิดใดภายในแต่ละบัญชี ให้ไปที่การตั้งค่า &gt; บัญชี"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"การเปลี่ยนแปลงใดๆ ที่คุณทำกับบัญชีของคุณบนเว็บจะถูกคัดลอกไปยังโทรศัพท์ของคุณโดยอัตโนมัติ\n\nบางบัญชีอาจคัดลอกการเปลี่ยนแปลงทั้งหมดที่คุณดำเนินการบนโทรศัพท์ไปยังเว็บโดยอัตโนมัติ บัญชี Google ทำงานเช่นนี้\n\nหากต้องการเลือกว่าจะซิงค์ข้อมูลชนิดใดภายในแต่ละบัญชี ให้ไปที่การตั้งค่า &gt; บัญชี"</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ปิดซิงค์ข้อมูลอัตโนมัติหรือไม่"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"การกระทำดังกล่าวจะเป็นการประหยัดการใช้ข้อมูลและแบตเตอรี่ แต่คุณจะต้องซิงค์แต่ละบัญชีด้วยตนเองเพื่อรวบรวมข้อมูลล่าสุด และคุณจะไม่ได้รับการแจ้งเตือนเมื่อมีการอัปเดต"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"วันที่รีเซ็ตรอบการใช้"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"ตั้งค่าเตือนการใช้ข้อมูล"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"ตั้งค่าขีดจำกัดการใช้ข้อมูล"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"การจำกัดการใช้ข้อมูล"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"การเชื่อมต่อข้อมูลผ่านมือถือของคุณจะถูกปิดใช้งานเมื่อครบจำนวนจำกัดที่ระบุไว้"\n\n"เนื่องจากการใช้งานข้อมูลถูกวัดปริมาณด้วยแท็บเล็ตของคุณ และผู้ให้บริการของคุณอาจมีการบันทึกปริมาณการใช้งานที่แตกต่างออกไป ดังนั้น โปรดเลือกวิธีที่ปลอดภัย"</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"การเชื่อมต่อข้อมูลผ่านมือถือของคุณจะถูกปิดใช้งานเมื่อครบจำนวนจำกัดที่ระบุไว้"\n\n"เนื่องจากการใช้งานข้อมูลถูกวัดปริมาณด้วยโทรศัพท์ของคุณ และผู้ให้บริการของคุณอาจมีการบันทึกปริมาณการใช้งานที่แตกต่างออกไป ดังนั้น โปรดเลือกวิธีที่ปลอดภัย"</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"การเชื่อมต่อข้อมูลผ่านมือถือของคุณจะถูกปิดใช้งานเมื่อครบจำนวนจำกัดที่ระบุไว้\n\nเนื่องจากการใช้งานข้อมูลถูกวัดปริมาณด้วยแท็บเล็ตของคุณ และผู้ให้บริการของคุณอาจมีการบันทึกปริมาณการใช้งานที่แตกต่างออกไป ดังนั้น โปรดเลือกวิธีที่ปลอดภัย"</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"การเชื่อมต่อข้อมูลผ่านมือถือของคุณจะถูกปิดใช้งานเมื่อครบจำนวนจำกัดที่ระบุไว้\n\nเนื่องจากการใช้งานข้อมูลถูกวัดปริมาณด้วยโทรศัพท์ของคุณ และผู้ให้บริการของคุณอาจมีการบันทึกปริมาณการใช้งานที่แตกต่างออกไป ดังนั้น โปรดเลือกวิธีที่ปลอดภัย"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"ต้องการจำกัดข้อมูลแบ็กกราวด์หรือไม่"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"หากคุณจำกัดข้อมูลแบ็กกราวด์บนมือถือ แอปพลิเคชันและบริการบางอย่างจะไม่ทำงานจนกว่าคุณจะเชื่อมต่อกับเครือข่าย WiFi"</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"หากคุณจำกัดข้อมูลพื้นหลังของมือถือ แอปพลิเคชันและบริการบางอย่างจะไม่ทำงานเว้นแต่คุณจะเชื่อมต่อกับเครือข่าย WiFi"\n\n"การตั้งค่านี้ส่งผลต่อผู้ใช้แท็บเล็ตนี้ทุกราย"</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"หากคุณจำกัดข้อมูลพื้นหลังของมือถือ แอปพลิเคชันและบริการบางอย่างจะไม่ทำงานเว้นแต่คุณจะเชื่อมต่อกับเครือข่าย WiFi"\n\n"การตั้งค่านี้ส่งผลต่อผู้ใช้โทรศัพท์นี้ทุกราย"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"หากคุณจำกัดข้อมูลพื้นหลังของมือถือ แอปพลิเคชันและบริการบางอย่างจะไม่ทำงานเว้นแต่คุณจะเชื่อมต่อกับเครือข่าย WiFi\n\nการตั้งค่านี้ส่งผลต่อผู้ใช้แท็บเล็ตนี้ทุกราย"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"หากคุณจำกัดข้อมูลพื้นหลังของมือถือ แอปพลิเคชันและบริการบางอย่างจะไม่ทำงานเว้นแต่คุณจะเชื่อมต่อกับเครือข่าย WiFi\n\nการตั้งค่านี้ส่งผลต่อผู้ใช้โทรศัพท์นี้ทุกราย"</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"คำเตือน"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ขีดจำกัด"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"แอปพลิเคชันที่นำออก"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"ผู้ใช้"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"โปรไฟล์ที่ถูกจำกัด"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"เพิ่มผู้ใช้ใหม่"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"คุณสามารถใช้อุปกรณ์นี้ร่วมกับคนอื่นๆ ได้ด้วยการสร้างผู้ใช้เพิ่มเติม ผู้ใช้แต่ละคนมีพื้นที่ของตัวเอง ซึ่งพวกเขาสามารถกำหนดค่าด้วยแอปพลิเคชัน วอลเปเปอร์ของตนเอง และอื่นๆ นอกจากนี้ ผู้ใช้ยังสามารถปรับการตั้งค่าแท็บเล็ต เช่น WiFi ซึ่งจะส่งผลกระทบต่อทุกคน"\n\n"หลังจากที่คุณสร้างผู้ใช้ใหม่แล้ว ผู้ใช้รายนั้นๆ ต้องทำตามขั้นตอนในการตั้งค่า"\n\n"ผู้ใช้ทั้งหมดสามารถยอมรับการอนุญาตแอปพลิเคชันที่มีการอัปเดตในนามของผู้ใช้รายอื่นๆ ได้"</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"หลังจากที่คุณสร้างผู้ใช้ใหม่แล้ว ผู้ใช้รายนั้นๆ ต้องทำตามขั้นตอนในการตั้งค่า"\n\n"ผู้ใช้ทั้งหมดสามารถยอมรับการอนุญาตแอปพลิเคชันที่มีการอัปเดตในนามของผู้ใช้รายอื่นๆ ได้"</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"คุณสามารถใช้อุปกรณ์นี้ร่วมกับคนอื่นๆ ได้ด้วยการสร้างผู้ใช้เพิ่มเติม ผู้ใช้แต่ละคนมีพื้นที่ของตัวเอง ซึ่งพวกเขาสามารถกำหนดค่าด้วยแอปพลิเคชัน วอลเปเปอร์ของตนเอง และอื่นๆ นอกจากนี้ ผู้ใช้ยังสามารถปรับการตั้งค่าแท็บเล็ต เช่น WiFi ซึ่งจะส่งผลกระทบต่อทุกคน\n\nหลังจากที่คุณสร้างผู้ใช้ใหม่แล้ว ผู้ใช้รายนั้นๆ ต้องทำตามขั้นตอนในการตั้งค่า\n\nผู้ใช้ทั้งหมดสามารถยอมรับการอนุญาตแอปพลิเคชันที่มีการอัปเดตในนามของผู้ใช้รายอื่นๆ ได้"</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"หลังจากที่คุณสร้างผู้ใช้ใหม่แล้ว ผู้ใช้รายนั้นๆ ต้องทำตามขั้นตอนในการตั้งค่า\n\nผู้ใช้ทั้งหมดสามารถยอมรับการอนุญาตแอปพลิเคชันที่มีการอัปเดตในนามของผู้ใช้รายอื่นๆ ได้"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"ตั้งค่าผู้ใช้ในขณะนี้หรือไม่"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"ตรวจสอบให้แน่ใจว่าบุคคลดังกล่าวจะสามารถนำแท็บเล็ตไปและตั้งค่าพื้นที่ของตน"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"หากต้องการตั้งค่าโปรไฟล์ทันที"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"การตั้งค่านี้ส่งผลต่อผู้ใช้โทรศัพท์นี้ทุกราย"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"เปลี่ยนภาษา"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"เปลี่ยนขนาดแบบอักษร"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"ข้อจำกัด"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"ลบข้อจำกัด"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"เปลี่ยน PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"แสดงการแจ้งเตือน"</string>
     <string name="help_label" msgid="1107174367904110532">"ความช่วยเหลือ"</string>
     <string name="user_account_title" msgid="1127193807312271167">"บัญชีสำหรับเนื้อหา"</string>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index bf7da47e656..80985ae4e5c 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Lokasyon"</item>
     <item msgid="255608127647030286">"Personal"</item>
     <item msgid="4588829735729884491">"Pagmemensahe"</item>
-    <item msgid="8971765125227378270">"Device"</item>
+    <item msgid="886742181977884584">"Media"</item>
+    <item msgid="7924928667052300589">"Device"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"tinatayang lokasyon"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"i-play ang audio"</item>
     <item msgid="8374996688066472414">"basahin ang clipboard"</item>
     <item msgid="3045529469061083747">"baguhin ang clipboard"</item>
+    <item msgid="5124443975763747838">"mga button ng media"</item>
+    <item msgid="4547883971364273343">"focus ng audio"</item>
+    <item msgid="2603878814882344450">"master na volume"</item>
+    <item msgid="7136963238377062018">"volume ng boses"</item>
+    <item msgid="4270236897655923007">"volume ng ring"</item>
+    <item msgid="6325739889222559394">"volume ng media"</item>
+    <item msgid="5762123934816216821">"volume ng alarma"</item>
+    <item msgid="785049718065337473">"volume ng notification"</item>
+    <item msgid="6700305533746877052">"volume ng bluetooth"</item>
+    <item msgid="2029227495214047094">"panatilihing bukas"</item>
+    <item msgid="26109888160231211">"subaybayan ang lokasyon"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokasyon"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"I-play ang audio"</item>
     <item msgid="136815868796597058">"Basahin ang clipboard"</item>
     <item msgid="5238692940326972503">"Baguhin ang clipboard"</item>
+    <item msgid="5753789168376302997">"Mga media button"</item>
+    <item msgid="3265262911688671938">"Focus ng audio"</item>
+    <item msgid="2098976479485046797">"Master volume"</item>
+    <item msgid="5660213838861789350">"Volume ng boses"</item>
+    <item msgid="7983336752371254444">"Volume ng pag-ring"</item>
+    <item msgid="7878027809189330917">"Volume ng media"</item>
+    <item msgid="7260546305036218513">"Volume ng alarm"</item>
+    <item msgid="9103719301075748925">"Volume ng notification"</item>
+    <item msgid="7025966722295861512">"Volume ng Bluetooth"</item>
+    <item msgid="4665183401128289653">"Panatilihing bukas"</item>
+    <item msgid="8584357129746649222">"Lokasyon"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Maikli"</item>
     <item msgid="2560532955514699713">"Katamtaman"</item>
     <item msgid="2372711992605524591">"Mahaba"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (debug)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Gamitin ang Dalvik"</item>
+    <item msgid="5131846588686178907">"Gamitin ang ART"</item>
+    <item msgid="4530003713865319928">"Gamitin ang build sa pag-debug ng ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Huwag kailanman suriin"</item>
     <item msgid="6042769699089883931">"Suriin lang para sa nilalamang DRM"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Sa screen bilang mga linya"</item>
     <item msgid="120512413928262547">"Sa adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"I-off"</item>
+    <item msgid="7688197031296835369">"Tingnan ang mga overdraw na bahagi"</item>
+    <item msgid="8332661909019981149">"Ipakita ang overdraw na counter"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Karaniwang limitasyon"</item>
     <item msgid="4071574792028999443">"Walang mga proseso sa background"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 43541fdcff3..30f8865dfcf 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Kapag papayagan mo ang roaming ng data, maaari kang magkaroon ng malalaking singilin sa roaming!\n\nNakakaapekto ang setting na ito sa lahat ng user sa tablet na ito."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Kapag papayagan mo ang roaming ng data, maaari kang magkaroon ng malalaking singilin sa roaming!\n\nNakakaapekto ang setting na ito sa lahat ng user sa teleponong ito."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Payagan ang roaming ng data?"</string>
     <string name="networks" msgid="6333316876545927039">"Pagpipilian ng operator"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Pumili ng isang tagapagpatakbo ng network"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Humiling ng numerong PIN o password upang i-decrypt ang iyong tablet sa bawat oras na i-on mo ito"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Humiling ng numerong PIN o password upang i-decrypt ang iyong telepono sa bawat oras na i-on mo ito"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Na-encrypt"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na apps at data ng mga ito, media, at iba pang mga file. Sa sandaling ma-encrypt mo ang iyong tablet, kailangan mong mag-type ng numeric na PIN o password upang i-decrypt ito sa tuwing i-o-on mo ito. Hindi mo maaaring i-decrypt ang iyong tablet maliban sa pamamagitan ng pagsasagawa ng pag-reset ng factory data, na bubura sa lahat ng iyong data."\n\n"Tumatagal nang isang oras o higit pa ang pag-encrypt. Dapat kang magsimula nang may naka-charge na baterya at panatilihing naka-plug in ang iyong tablet hanggang sa makumpleto ang pag-encrypt. Kung aantalahin mo ang proseso ng pag-encrypt, mawawala mo ang ilan o lahat ng iyong data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na apps at data ng mga ito, media, at iba pang mga file. Sa sandaling ma-encrypt mo ang iyong telepono, kailangan mong mag-type ng numeric na PIN o password upang i-decrypt ito sa tuwing i-o-on mo ito. Hindi mo maaaring i-decrypt ang iyong telepono maliban sa pamamagitan ng pagsasagawa ng pag-reset ng factory data, na bubura sa lahat ng iyong data."\n\n"Tumatagal nang isang oras o higit pa ang pag-encrypt. Dapat kang magsimula nang may naka-charge na baterya at panatilihing naka-plug in ang iyong telepono hanggang sa makumpleto ang pag-encrypt. Kung aantalahin mo ang proseso ng pag-encrypt, mawawala mo ang ilan sa o lahat ng iyong data."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na apps at data ng mga ito, media, at iba pang mga file. Sa sandaling ma-encrypt mo ang iyong tablet, kailangan mong mag-type ng numeric na PIN o password upang i-decrypt ito sa tuwing i-o-on mo ito. Hindi mo maaaring i-decrypt ang iyong tablet maliban sa pamamagitan ng pagsasagawa ng pag-reset ng factory data, na bubura sa lahat ng iyong data.\n\nTumatagal nang isang oras o higit pa ang pag-encrypt. Dapat kang magsimula nang may naka-charge na baterya at panatilihing naka-plug in ang iyong tablet hanggang sa makumpleto ang pag-encrypt. Kung aantalahin mo ang proseso ng pag-encrypt, mawawala mo ang ilan o lahat ng iyong data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na apps at data ng mga ito, media, at iba pang mga file. Sa sandaling ma-encrypt mo ang iyong telepono, kailangan mong mag-type ng numeric na PIN o password upang i-decrypt ito sa tuwing i-o-on mo ito. Hindi mo maaaring i-decrypt ang iyong telepono maliban sa pamamagitan ng pagsasagawa ng pag-reset ng factory data, na bubura sa lahat ng iyong data.\n\nTumatagal nang isang oras o higit pa ang pag-encrypt. Dapat kang magsimula nang may naka-charge na baterya at panatilihing naka-plug in ang iyong telepono hanggang sa makumpleto ang pag-encrypt. Kung aantalahin mo ang proseso ng pag-encrypt, mawawala mo ang ilan sa o lahat ng iyong data."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"I-encrypt ang tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"I-encrypt ang telepono"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"I-charge ang iyong baterya at subukang muli."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Subukang muli sa loob ng <xliff:g id="DELAY">^1</xliff:g> (na) segundo."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"I-type ang iyong password"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Hindi matagumpay ang pag-encrypt"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Nagambala at hindi makumpleto ang pag-encrypt. Bilang resulta, hindi na maa-access ang data sa iyong telepono. "\n\n"Upang patuloy na magamit ang iyong tablet, kailangan mong magsagawa ng factory reset. Kapag na-set up mo ang iyong tablet pagkatapos ng pag-reset, magkakaroon ka ng pagkakataong magbalik ng anumang data na na-back up sa iyong Google Account."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Nagambala at hindi makumpleto ang pag-encrypt. Bilang resulta, hindi na maa-access ang data sa iyong telepono. "\n\n"Upang patuloy na magamit ang iyong telepono, kailangan mong magsagawa ng factory reset. Kapag na-set up mo ang iyong telepono pagkatapos ng pag-reset, magkakaraoon ka ng pagkakataong magbalik ng anumang data na na-back up sa iyong Google Account."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Nagambala at hindi makumpleto ang pag-encrypt. Bilang resulta, hindi na maa-access ang data sa iyong telepono. \n\nUpang patuloy na magamit ang iyong tablet, kailangan mong magsagawa ng factory reset. Kapag na-set up mo ang iyong tablet pagkatapos ng pag-reset, magkakaroon ka ng pagkakataong magbalik ng anumang data na na-back up sa iyong Google Account."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Nagambala at hindi makumpleto ang pag-encrypt. Bilang resulta, hindi na maa-access ang data sa iyong telepono. \n\nUpang patuloy na magamit ang iyong telepono, kailangan mong magsagawa ng factory reset. Kapag na-set up mo ang iyong telepono pagkatapos ng pag-reset, magkakaraoon ka ng pagkakataong magbalik ng anumang data na na-back up sa iyong Google Account."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Magpalit ng pamamaraan ng pag-input"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Pumili ng screen lock"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Pumili ng backup na lock"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Kumokonekta"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Nakakonekta"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Available"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Ginagamit"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Mga setting ng display"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Magdiskonekta?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Tatapusin nito ang iyong koneksyon sa:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"I-off"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Hindi available dahil naka-off ang NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Kapag in-on ang tampok na ito, maaari mong i-beam ang nilalaman ng app sa isa pang device na may kakayahan sa NFC sa pamamagitan ng paghawak sa mga device nang magkalapit. Halimbawa, maaari mong i-beam ang mga pahina sa Browser, video sa YouTube, contact sa People, at higit pa."\n\n"Paglapitin lamang ang mga device (karaniwang magkatalikuran) at pagkatapos ay pindutin ang iyong screen. Tinutukoy ng app kung ano ang nabi-beam."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Kapag in-on ang tampok na ito, maaari mong i-beam ang nilalaman ng app sa isa pang device na may kakayahan sa NFC sa pamamagitan ng paghawak sa mga device nang magkalapit. Halimbawa, maaari mong i-beam ang mga pahina sa Browser, video sa YouTube, contact sa People, at higit pa.\n\nPaglapitin lamang ang mga device (karaniwang magkatalikuran) at pagkatapos ay pindutin ang iyong screen. Tinutukoy ng app kung ano ang nabi-beam."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Pagtuklas sa serbisyo ng network"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Payagan ang apps sa iba pang mga device na tumuklas ng apps sa device na ito"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Naka-secure gamit ang <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", naka-secure gamit ang <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Wala"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Upang mapahusay ang katumpakan ng lokasyon at para sa iba pang mga layunin, gustong i-on ng <xliff:g id="APP_NAME">%1$s</xliff:g> ang pag-scan ng network, kahit na naka-off ang Wi-Fi."\n\n"Payagan ito para sa lahat ng apps na gustong mag-scan?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Upang mapahusay ang katumpakan ng lokasyon at para sa iba pang mga layunin, gustong i-on ng <xliff:g id="APP_NAME">%1$s</xliff:g> ang pag-scan ng network, kahit na naka-off ang Wi-Fi.\n\nPayagan ito para sa lahat ng apps na gustong mag-scan?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Payagan"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Tanggihan"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Kumonekta"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"BABALA: Maaari kang makaipon ng karagdagang mga singil sa data ng carrier.\n\nMaaaring mangailangan ng malaking aktibidad ng network ang pag-setup ng tablet."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"BABALA: Maaari kang makaipon ng karagdagang mga singil sa data ng carrier.\n\nMaaaring mangailangan ng malaking aktibidad ng network ang pag-setup ng telepono."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"BABALA: Hangga\'t wala ka pang koneksyon sa internet, hindi mabe-verify ng tablet na napapanahon ang iyong software."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"BABALA: Hangga\'t wala ka pang koneksyon sa internet, hindi mabe-verify ng telepono na napapanahon ang iyong software."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Hindi nakakonekta sa Wi-Fi network na ito ang tablet."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Maling PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Hindi tugma ang mga PIN"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Hindi mapalitan ang PIN."\n"Posibleng maling PIN."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Hindi mapalitan ang PIN.\nPosibleng maling PIN."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Matagumpay na binago ang PIN ng SIM"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Hindi mabago ang katayuan ng lock ng SIM card."\n"Posibleng maling PIN."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Hindi mabago ang katayuan ng lock ng SIM card.\nPosibleng maling PIN."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Kanselahin"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Katayuan ng tablet"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"I-reset ang data ng factory"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Binubura ang lahat ng data sa tablet"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Binubura ang lahat ng data sa telepono"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Buburahin nito ang lahat ng data mula sa "<b>"panloob na storage"</b>" ng iyong tablet, kabilang ang:"\n\n<li>"Iyong Google account"</li>\n<li>"System at data ng app at mga setting"</li>\n<li>"Na-download na apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Buburahin nito ang lahat ng data mula sa "<b>"panloob na storage"</b>" ng iyong telepono, kabilang ang:"\n\n<li>"Iyong Google account"</li>\n<li>"System at data ng app at mga setting"</li>\n<li>"Na-download na apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kasalukuyan kang naka-sign in sa mga sumusunod na account:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Buburahin nito ang lahat ng data mula sa "<b>"panloob na storage"</b>" ng iyong tablet, kabilang ang:\n\n"<li>"Iyong Google account"</li>\n<li>"System at data ng app at mga setting"</li>\n<li>"Na-download na apps"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Buburahin nito ang lahat ng data mula sa "<b>"panloob na storage"</b>" ng iyong telepono, kabilang ang:\n\n"<li>"Iyong Google account"</li>\n<li>"System at data ng app at mga setting"</li>\n<li>"Na-download na apps"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kasalukuyan kang naka-sign in sa mga sumusunod na account:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musika"</li>\n<li>"Mga Larawan"</li>\n<li>"Ibang data ng user"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Upang i-clear ang musika, mga larawan, at iba pang data ng user, kailangang mabura ang "<b>"USB storage"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Upang i-clear ang musika, mga larawan, at ibang data ng user, kailangang mabura ang "<b>"SD card"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Ipakita na-cache proseso"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"I-reset kagustuhan sa app"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"I-reset ang gusto sa app?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ire-reset nito ang lahat ng kagustuhan para sa:"\n\n" "<li>"Hindi pinapaganang apps"</li>\n" "<li>"Mga notification ng hindi pinapaganang app"</li>\n" "<li>"Mga default na application para sa mga pagkilos"</li>\n" "<li>"Paghihigpit sa data sa background para sa apps"</li>\n\n" Hindi ka mawawalan ng anumang data ng app."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ire-reset nito ang lahat ng kagustuhan para sa:\n\n "<li>"Hindi pinapaganang apps"</li>\n" "<li>"Mga notification ng hindi pinapaganang app"</li>\n" "<li>"Mga default na application para sa mga pagkilos"</li>\n" "<li>"Paghihigpit sa data sa background para sa apps"</li>\n\n" Hindi ka mawawalan ng anumang data ng app."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"I-reset ang apps"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Pamahalaan ang espasyo"</string>
     <string name="filter" msgid="2018011724373033887">"I-filter"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para palit, pindot Control-Spacebar"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Default"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Mga layout ng keyboard"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diksyunaryo ng user"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Personal na diksyunaryo"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Personal na mga diksyunaryo"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Personal na diksyunaryo"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Magdagdag"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Idagdag sa diksyunaryo"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Isama ang pagpipilian sa menu ng power para sa pagkuha ng ulat sa bug"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Manatiling gumagana"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Hindi kailanman hihinto ang screen kapag kinakargahan"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"I-enable ang Bluetooth HCI snoop log"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"I-capture ang lahat ng bluetooth HCI packet sa isang file"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Piliin ang runtime"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Piliin ang runtime"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"I-reboot upang baguhin ang runtime mula sa <xliff:g id="OLD">%1$s</xliff:g> patungo sa <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Payagan ang mga kunwaring lokasyon"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Payagan ang mga kunwaring lokasyon"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Payagan ang pag-debug ng USB?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Protektahan ang USB storage"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Dapat humiling ng pahintulot ang apps na basahin ang USB storage"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Protektahan ang USB storage?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Kapag pinoprotektahan ang USB storage, dapat na humiling ng pahintulot ang apps na magbasa ng data mula sa panlabas na storage."\n\n"Maaaring hindi gumana ang ilang apps hanggang sa ma-update ng mga developer ng mga ito."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Kapag pinoprotektahan ang USB storage, dapat na humiling ng pahintulot ang apps na magbasa ng data mula sa panlabas na storage.\n\nMaaaring hindi gumana ang ilang apps hanggang sa ma-update ng mga developer ng mga ito."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Protektahan ang SD card"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Dapat na humiling ng pahintulot ang apps na basahin ang SD card"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Protektahan ang SD card?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Kapag pinoprotektahan ang SD card, dapat na humiling ng pahintulot ang apps na magbasa ng data mula sa panlabas na storage."\n\n"Maaaring hindi gumana ang ilang apps hanggang sa ma-update ng mga developer ng mga ito."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Kapag pinoprotektahan ang SD card, dapat na humiling ng pahintulot ang apps na magbasa ng data mula sa panlabas na storage.\n\nMaaaring hindi gumana ang ilang apps hanggang sa ma-update ng mga developer ng mga ito."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Lokal na terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Paganahin ang terminal app na nag-aalok ng lokal na shell access"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Pumili ng gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Pumili ng widget"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Likhain ang widget at payagan ang access?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Mga Serbisyo"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"System"</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_screen_magnification_summary" msgid="2380627654189671754">"Kapag naka-on ang tampok na ito, maaari kang mag-zoom in at out sa pamamagitan ng pag-tap sa screen nang tatlong beses.\n\nHabang naka-zoom in, maaari kang:\n"<ul><li>"Mag-pan: I-drag ang dalawa o higit pang mga daliri sa screen."</li>\n<li>"Ayusin ang antas ng pag-zoom: I-pinch ang dalawa o higit pang daliri o paghiwalayin ang mga ito."</li></ul>\n\n"Maaari mo ring pansamantalang i-magnify kung ano ang nasa ilalim ng iyong mga daliri sa pamamagitan ng pag-tap nang tatlong beses at pagpindot nang matagal. Sa antas na naka-magnify, maaari mong i-drag ang iyong daliri upang maggalugad sa iba\'t ibang mga bahagi ng screen. Angatin ang iyong daliri upang bumalik sa iyong nakaraang katayuan.\n\nTandaan: Gumagana saanman ang pag-tap nang tatlong beses para sa pag-magnify maliban sa keyboard at navigation bar."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Shortcut sa pagiging naa-access"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"I-on"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"I-off"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Kapag naka-on ang tampok na ito, mabilis mong mapapagana ang mga tampok ng accessibility sa dalawang hakbang:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Kapag naka-on ang tampok na ito, mabilis mong mapapagana ang mga tampok ng accessibility sa dalawang hakbang:\n\nHakbang 1: Pindutin nang matagal ang power button hanggang sa may marinig kang tunog o maramdamang vibration.\n\nHakbang 2: Pindutin nang matagal gamit ang dalawang daliri hanggang sa makarinig ka ng kumpirmasyong audio.\n\nKung marami ang user ng device, pansamantalang pinapagana ng paggamit sa shortcut na ito sa lock screen ang accessibility hanggang sa ma-unlock ang device."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Malaking teksto"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Pag-magnify ng screen"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"I-auto update pag-magnify ng screen"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Nagbibigay ang TalkBack ng pasalitang feedback upang matulungan ang mga user na bulag at may mahinang paningin. Nais mo ba itong i-install nang libre mula sa Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Walang ibinigay na paglalarawan."</string>
     <string name="settings_button" msgid="3006713718908152930">"Mga Setting"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Pag-print"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Mga setting ng pag-print"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Mga Serbisyo"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Gumamit ng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"Makakatanggap ang <xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> ng mga dokumentong pini-print mo. Maaaring maglaman ang mga naturang dokumento ng sensitibong data."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Walang mga naka-install na serbisyo"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Mga Setting"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Magdagdag ng mga printer"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Naka-on"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Naka-off"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterya"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Ano ang gumagamit ng baterya"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Di avail data ng gmit baterya."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Tumatakbo ang Wi-Fi"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telepono"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Ipinadala ang data"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Natanggap na data"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Naipadala ang data sa mobile"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Natanggap ang data sa mobile"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Naipadala ang data ng Wi‑Fi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Natanggap ang data ng Wi‑Fi"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Naka-on ang oras"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pitch"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Naaapektuhan ang tono ng tekstong sinasabi"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Wika"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Walang napiling wika"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Itinatakda ang boses na partikular sa wika para sa sinasambit na teksto"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Makinig sa isang halimbawa"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Mag-play ng maikling pagpapakita ng speech synthesis"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"Hindi sinusuportahan ang EAP."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Hindi ka makakapag-configure ng koneksyong EAP Wi-Fi sa panahon ng pag-setup. Pagkatapos ng pag-setup, magagawa mo iyon sa Mga Setting &gt; Wireless at mga network."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Maaaring tumagal nang ilang minuto ang pagkonekta…"</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Pindutin ang "<b>"Susunod"</b>" upang magpatuloy sa pag-setup."\n\n"Pindutin ang "<b>"Bumalik"</b>" upang kumonekta sa ibang Wi-Fi network."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Pindutin ang "<b>"Susunod"</b>" upang magpatuloy sa pag-setup.\n\nPindutin ang "<b>"Bumalik"</b>" upang kumonekta sa ibang Wi-Fi network."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Pinapagana ang sync"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Hindi pinapagana ang pag-sync"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Error sa pag-sync."</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalendaryo"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Mga Contact"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Maligayang pagdating sa Google sync!"</font>" "\n"Isang paraan ng Google sa pag-sync ng data upang payagan ang access sa iyong mga contact, appointment, at higit pa nasaan ka man."</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Maligayang pagdating sa Google sync!"</font>" \nIsang paraan ng Google sa pag-sync ng data upang payagan ang access sa iyong mga contact, appointment, at higit pa nasaan ka man."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Mga setting ng pag-sync ng app"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Data at pag-synchronize"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Palitan ang password"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"I-debug ang GPU overdraw"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Wag paganahin HW overlay"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Laging gamitin ang GPU para sa screen compositing"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Paganahin trace ng OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Wg pgnhin bckgrnd data mble ntwrk. Ggmit non-mble ntwrk kng mrn."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Upang paghigpitan ang data ng background para sa app na ito, magtakda muna ng isang limitasyon sa mobile data."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Paghigpitan ang data ng background?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ang tampok na ito ay maaaring maging sanhi ng pagtigil ng app na nakadepende sa data ng background kapag mga mobile network lang ang available."\n\n"Maaari kang makahanap ng higit pang naaangkop na mga kontrol sa paggamit ng data sa mga setting na available sa loob ng app."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ang tampok na ito ay maaaring maging sanhi ng pagtigil ng app na nakadepende sa data ng background kapag mga mobile network lang ang available.\n\nMaaari kang makahanap ng higit pang naaangkop na mga kontrol sa paggamit ng data sa mga setting na available sa loob ng app."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Posible lamang ang paghihigpit sa data ng background kapag nagtakda ka ng isang limitasyon sa mobile data."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"I-on ang pag-auto-sync ng data?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Awtomatikong makokopya sa iyong tablet ang anumang pagbabagong ginawa mo sa iyong mga account sa web."\n\n"Awtomatiko ring kinokopya ng ilang account ang anumang pagbabagong ginawa mo sa tablet sa web. Gumagana sa ganitong paraan ang isang Google Account."\n\n"Upang piliin kung aling uri ng impormasyon ang isi-snyc sa loob ng bawat account, pumunta sa Mga Setting at Account."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Awtomatikong makokopya sa iyong telepono ang anumang mga pagbabagong gagawin mo sa iyong mga account sa web."\n\n"Maaaring awtomatiko ring kopyahin ng ilang account ang anumang mga pagbabagong gagawin mo sa telepono sa web. Gumagana sa ganitong paraan ang isang Google Account."\n\n"Upang piliin kung aling mga uri ng impormasyon ang isi-snyc sa loob ng bawat account, pumunta sa Mga Setting at Account."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Awtomatikong makokopya sa iyong tablet ang anumang pagbabagong ginawa mo sa iyong mga account sa web.\n\nAwtomatiko ring kinokopya ng ilang account ang anumang pagbabagong ginawa mo sa tablet sa web. Gumagana sa ganitong paraan ang isang Google Account.\n\nUpang piliin kung aling uri ng impormasyon ang isi-snyc sa loob ng bawat account, pumunta sa Mga Setting at Account."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Awtomatikong makokopya sa iyong telepono ang anumang mga pagbabagong gagawin mo sa iyong mga account sa web.\n\nMaaaring awtomatiko ring kopyahin ng ilang account ang anumang mga pagbabagong gagawin mo sa telepono sa web. Gumagana sa ganitong paraan ang isang Google Account.\n\nUpang piliin kung aling mga uri ng impormasyon ang isi-snyc sa loob ng bawat account, pumunta sa Mga Setting at Account."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"I-off ang pag-auto-sync ng data?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Mababawasan nito ang paggamit ng data at baterya, ngunit kakailanganin mong manu-manong i-sync ang bawat account upang kumolekta ng kamakailang impormasyon. At hindi ka makakatanggap ng mga notification kapag naganap ang mga pag-update."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Petsa ng pag-reset ng cycle sa paggamit"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Itakda ang babala sa paggamit ng data"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Itakda ang limitasyon sa paggamit ng data"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Pag-limit sa paggamit ng data"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Hindi pagaganahin ang koneksyon ng iyong data ng mobile kapag naabot na ang tinukoy na limitasyon."\n\n"Dahil sinusukat ng iyong tablet ang paggamit ng data, at maaaring kuwentahin ang iyong carrier para sa paggamit sa ibang paraan, isaalang-alang ang paggamit ng konserbatibong limitasyon."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Hindi pagaganahin ang koneksyon ng iyong data ng mobile kapag naabot na ang tinukoy na limitasyon."\n\n"Dahil sinusukat ng iyong telepono ang paggamit ng data, at maaaring kuwentahin ang iyong carrier para sa paggamit sa ibang paraan, isaalang-alang ang paggamit ng konserbatibong limitasyon."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Hindi pagaganahin ang koneksyon ng iyong data ng mobile kapag naabot na ang tinukoy na limitasyon.\n\nDahil sinusukat ng iyong tablet ang paggamit ng data, at maaaring kuwentahin ang iyong carrier para sa paggamit sa ibang paraan, isaalang-alang ang paggamit ng konserbatibong limitasyon."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Hindi pagaganahin ang koneksyon ng iyong data ng mobile kapag naabot na ang tinukoy na limitasyon.\n\nDahil sinusukat ng iyong telepono ang paggamit ng data, at maaaring kuwentahin ang iyong carrier para sa paggamit sa ibang paraan, isaalang-alang ang paggamit ng konserbatibong limitasyon."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Paghigpitan ang data ng background?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Kung paghihigpitan mo ang background na data sa mobile, hindi gagana ang ilang apps at serbisyo maliban kung nakakonekta ka sa isang Wi-Fi network."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Kung paghihigpitan mo ang background na data sa mobile, hindi gagana ang ilang apps at serbisyo maliban kung nakakonekta ka sa isang Wi-Fi network."\n\n"Nakakaapekto ang setting na ito sa lahat ng user sa tablet na ito."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Kung paghihigpitan mo ang background na data sa mobile, hindi gagana ang ilang apps at serbisyo maliban kung nakakonekta ka sa isang Wi-Fi network."\n\n"Nakakaapekto ang setting na ito sa lahat ng user sa teleponong ito."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Kung paghihigpitan mo ang background na data sa mobile, hindi gagana ang ilang apps at serbisyo maliban kung nakakonekta ka sa isang Wi-Fi network.\n\nNakakaapekto ang setting na ito sa lahat ng user sa tablet na ito."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Kung paghihigpitan mo ang background na data sa mobile, hindi gagana ang ilang apps at serbisyo maliban kung nakakonekta ka sa isang Wi-Fi network.\n\nNakakaapekto ang setting na ito sa lahat ng user sa teleponong ito."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"babala"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limitasyon"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Mga inalis na app"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"User"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Pinaghihigpitang profile"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Idagdag ang bagong user"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Maibabahagi mo ang device na ito sa iba pang mga tao sa pamamagitan ng paglikha ng mga karagdagang user. May sariling espasyo ang bawat user, na mako-customize nila gamit ang kanilang sariling apps, wallpaper, at higit pa. Maisasaayos din ng mga user ang mga setting ng tablet tulad ng Wi-Fi na makakaapekto sa lahat."\n\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_add_user_message_long" msgid="3086244205384741788">"Maibabahagi mo ang device na ito sa iba pang mga tao sa pamamagitan ng paglikha ng mga karagdagang user. May sariling espasyo ang bawat user, na mako-customize nila gamit ang kanilang sariling apps, wallpaper, at higit pa. Maisasaayos din ng mga user ang mga setting ng tablet tulad ng Wi-Fi na makakaapekto sa lahat.\n\nPagkatapos mong lumikha ng bagong user, kailangang sumailalim ng taong iyon sa proseso ng pag-setup.\n\nAng sinumang user ay maaaring tumanggap ng na-update na mga pagpapahintulot sa app sa ngalan ng lahat ng iba pang user."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Pagkatapos mong lumikha ng bagong user, kailangang sumailalim ng taong iyon sa proseso ng pag-setup.\n\nAng sinumang user ay maaaring tumanggap ng na-update na mga pagpapahintulot sa app sa ngalan ng lahat ng iba pang user."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"I-set up ang user ngayon?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Tiyaking available ang tao na kunin ang tablet at i-set up ang kanyang espasyo"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Mag-set up ng profile ngayon?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Nakakaapekto ang setting na ito sa lahat ng user sa teleponong ito."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Baguhin ang wika"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Baguhin ang laki ng font"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Mga Paghihigpit"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Alisin ang paghihigpit"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Palitan ang PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Ipakita notification"</string>
     <string name="help_label" msgid="1107174367904110532">"Tulong"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Account para sa nilalaman"</string>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 31b15f0b51a..e052fd17ba1 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Konum"</item>
     <item msgid="255608127647030286">"Kişisel"</item>
     <item msgid="4588829735729884491">"Mesajlaşma"</item>
-    <item msgid="8971765125227378270">"Cihaz"</item>
+    <item msgid="886742181977884584">"Medya"</item>
+    <item msgid="7924928667052300589">"Cihaz"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"yaklaşık konum"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"sesi çal"</item>
     <item msgid="8374996688066472414">"panoyu oku"</item>
     <item msgid="3045529469061083747">"panoyu değiştir"</item>
+    <item msgid="5124443975763747838">"medya düğmeleri"</item>
+    <item msgid="4547883971364273343">"ses odağı"</item>
+    <item msgid="2603878814882344450">"ana ses düzeyi"</item>
+    <item msgid="7136963238377062018">"konuşma sesi düzeyi"</item>
+    <item msgid="4270236897655923007">"çalma sesi düzeyi"</item>
+    <item msgid="6325739889222559394">"medya sesi düzeyi"</item>
+    <item msgid="5762123934816216821">"alarm sesi düzeyi"</item>
+    <item msgid="785049718065337473">"bildirim sesi düzeyi"</item>
+    <item msgid="6700305533746877052">"Bluetooth sesi düzeyi"</item>
+    <item msgid="2029227495214047094">"uyanık tut"</item>
+    <item msgid="26109888160231211">"konumu izle"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Konum"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Sesi çal"</item>
     <item msgid="136815868796597058">"Panoyu oku"</item>
     <item msgid="5238692940326972503">"Panoyu değiştir"</item>
+    <item msgid="5753789168376302997">"Medya düğmeleri"</item>
+    <item msgid="3265262911688671938">"Ses odağı"</item>
+    <item msgid="2098976479485046797">"Ana ses düzeyi"</item>
+    <item msgid="5660213838861789350">"Konuşma sesi düzeyi"</item>
+    <item msgid="7983336752371254444">"Zil sesi düzeyi"</item>
+    <item msgid="7878027809189330917">"Medya sesi düzeyi"</item>
+    <item msgid="7260546305036218513">"Alarm sesi düzeyi"</item>
+    <item msgid="9103719301075748925">"Bildirim sesi düzeyi"</item>
+    <item msgid="7025966722295861512">"Bluetooth ses düzeyi"</item>
+    <item msgid="4665183401128289653">"Uyanık tut"</item>
+    <item msgid="8584357129746649222">"Konum"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kısa"</item>
     <item msgid="2560532955514699713">"Orta"</item>
     <item msgid="2372711992605524591">"Uzun"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (hata ayıklama)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Dalvik\'i kullan"</item>
+    <item msgid="5131846588686178907">"ART\'yi kullan"</item>
+    <item msgid="4530003713865319928">"ART hata ayıklama derlemesini kullan"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Hiçbir zaman denetleme"</item>
     <item msgid="6042769699089883931">"Yalnızca DRM içeriğini denetle"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Ekranda çizgi şeklinde"</item>
     <item msgid="120512413928262547">"adb shell dumpsys gfxinfo içinde"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Kapalı"</item>
+    <item msgid="7688197031296835369">"Fazla çizilen alanları göster"</item>
+    <item msgid="8332661909019981149">"Fazla çizim sayacını göster"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standart sınır"</item>
     <item msgid="4071574792028999443">"Arka planda işlem yok"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 60dd0eacce1..216ca47f399 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Veri dolaşımına izin verirseniz, önemli düzeyde dolaşım ücretleriyle karşılaşabilirsiniz!\n\nBu ayar bu tabletteki tüm kullanıcıları etkiler."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Veri dolaşımına izin verirseniz, önemli düzeyde dolaşım ücretleriyle karşılaşabilirsiniz!\n\nBu ayar bu telefondaki tüm kullanıcıları etkiler."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Veri dolaşımına izin verilsin mi?"</string>
     <string name="networks" msgid="6333316876545927039">"Operatör seçimi"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Bir ağ operatörü seçin"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Tabletinizin her açılışında şifresinin çözülmesi için sayısal bir PIN veya şifre istensin"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Telefonunuzun her açılışında şifresinin çözülmesi için sayısal bir PIN veya şifre istensin"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Şifreli"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ait verileri, medyaları ve diğer dosyaları şifreleyebilirsiniz. Tabletinizi şifreledikten sonra, cihazı her açtığınızda şifresini çözmek için sayısal bir PIN veya şifre girmeniz gerekir. Tabletinizdeki tüm verileri silen fabrika verilerine sıfırlama işlemi yapmadan şifrelemeyi kaldıramazsınız."\n\n"Şifreleme işlemi bir saat kadar sürer. İşlemi, dolu bir pille başlatmalı ve şifreleme tamamlanana kadar tabletinizi fişe takılı tutmalısınız. Şifreleme işlemini yarıda keserseniz, verilerinizin bir kısmını veya tamamını kaybedersiniz."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ait verileri, medyaları ve diğer dosyaları şifreleyebilirsiniz. Telefonunuzu şifreledikten sonra, cihazı her açtığınızda şifresini çözmek için sayısal bir PIN veya şifre girmeniz gerekir. Telefonunuzdaki tüm verileri silen fabrika verilerine sıfırlama işlemi yapmadan şifrelemeyi kaldıramazsınız."\n\n"Şifreleme işlemi bir saat kadar sürer. İşlemi, dolu bir pille başlatmalı ve şifreleme tamamlanana kadar telefonunuzu fişe takılı tutmalısınız. Şifreleme işlemini yarıda keserseniz, verilerinizin bir kısmını veya tamamını kaybedersiniz."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ait verileri, medyaları ve diğer dosyaları şifreleyebilirsiniz. Tabletinizi şifreledikten sonra, cihazı her açtığınızda şifresini çözmek için sayısal bir PIN veya şifre girmeniz gerekir. Tabletinizdeki tüm verileri silen fabrika verilerine sıfırlama işlemi yapmadan şifrelemeyi kaldıramazsınız.\n\nŞifreleme işlemi bir saat kadar sürer. İşlemi, dolu bir pille başlatmalı ve şifreleme tamamlanana kadar tabletinizi fişe takılı tutmalısınız. Şifreleme işlemini yarıda keserseniz, verilerinizin bir kısmını veya tamamını kaybedersiniz."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ait verileri, medyaları ve diğer dosyaları şifreleyebilirsiniz. Telefonunuzu şifreledikten sonra, cihazı her açtığınızda şifresini çözmek için sayısal bir PIN veya şifre girmeniz gerekir. Telefonunuzdaki tüm verileri silen fabrika verilerine sıfırlama işlemi yapmadan şifrelemeyi kaldıramazsınız.\n\nŞifreleme işlemi bir saat kadar sürer. İşlemi, dolu bir pille başlatmalı ve şifreleme tamamlanana kadar telefonunuzu fişe takılı tutmalısınız. Şifreleme işlemini yarıda keserseniz, verilerinizin bir kısmını veya tamamını kaybedersiniz."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tableti şifrele"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefonu şifrele"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Pilinizi şarj edip tekrar deneyin."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> saniye içinde yeniden deneyin."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Şifrenizi yazın"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Şifreleme başarısız oldu"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Şifreleme kesildi ve tamamlanamıyor. Bu durum nedeniyle tabletinizdeki verilere artık erişilemiyor."\n\n"Tabletinizi kullanmaya devam edebilmek için, fabrika ayarlarına sıfırlama işlemi gerçekleştirmeniz gerekir. Sıfırlama işleminden sonra tabletinizin kurulumunu yaptığınızda, Google Hesabınıza yedeklenen tüm verileri geri yükleme fırsatınız olacaktır."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Şifreleme kesildi ve tamamlanamıyor. Bu durum nedeniyle telefonunuzdaki verilere artık erişilemiyor."\n\n"Telefonunuz kullanmaya devam edebilmek için, fabrika ayarlarına sıfırlama işlemi gerçekleştirmeniz gerekir. Sıfırlama işleminden sonra telefonunuzun kurulumunu yaptığınızda, Google Hesabınıza yedeklenen tüm verileri geri yükleme fırsatınız olacaktır."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Şifreleme kesildi ve tamamlanamıyor. Bu durum nedeniyle tabletinizdeki verilere artık erişilemiyor.\n\nTabletinizi kullanmaya devam edebilmek için, fabrika ayarlarına sıfırlama işlemi gerçekleştirmeniz gerekir. Sıfırlama işleminden sonra tabletinizin kurulumunu yaptığınızda, Google Hesabınıza yedeklenen tüm verileri geri yükleme fırsatınız olacaktır."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Şifreleme kesildi ve tamamlanamıyor. Bu durum nedeniyle telefonunuzdaki verilere artık erişilemiyor.\n\nTelefonunuz kullanmaya devam edebilmek için, fabrika ayarlarına sıfırlama işlemi gerçekleştirmeniz gerekir. Sıfırlama işleminden sonra telefonunuzun kurulumunu yaptığınızda, Google Hesabınıza yedeklenen tüm verileri geri yükleme fırsatınız olacaktır."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Giriş yöntemini değiştir"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Ekran kilidini seçin"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Yedek kilidi seçin"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Bağlanılıyor"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Bağlandı"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Kullanılabilir"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Kullanımda"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Ekran ayarları"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Bağlantı kesilsin mi?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Şu cihazla bağlantınız kesilecek:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Kapalı"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC kapalı olduğundan kullanılamıyor"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Bu özellik açık olduğunda, cihazları birbirine yakın tutarak uygulama içeriğini NFC özelliği olan başka bir cihaza ışınlayabilirsiniz. Örneğin, Tarayıcı sayfalarını, YouTube videolarını, Kayıtlı kişilerinizi ve diğer verileri ışınlayabilirsiniz."\n\n"Cihazları bir araya getirmeniz (genellikle sırt sırta) ve ekranınıza dokunmanız yeterli. Uygulama nelerin ışınlanacağını belirler."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Bu özellik açık olduğunda, cihazları birbirine yakın tutarak uygulama içeriğini NFC özelliği olan başka bir cihaza ışınlayabilirsiniz. Örneğin, Tarayıcı sayfalarını, YouTube videolarını, Kayıtlı kişilerinizi ve diğer verileri ışınlayabilirsiniz.\n\nCihazları bir araya getirmeniz (genellikle sırt sırta) ve ekranınıza dokunmanız yeterli. Uygulama nelerin ışınlanacağını belirler."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Ağ hizmeti keşfi"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Diğer cihazlardaki uygulamaların bu cihazdaki uygulamaları keşfetmesine izin ver"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Kablosuz"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Güvenliği <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> ile sağlanıyor"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", güvenliği <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> ile sağlanıyor"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Yok"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Konum bilgisinin doğruluğunu artırmak ve diğer amaçlar için, <xliff:g id="APP_NAME">%1$s</xliff:g> Kablosuz bağlantı kapalı olduğunda bile ağ tarama işlevini açmak istiyor."\n\n"Tarama yapmak isteyen tüm uygulamaların bu işlevi kullanmalarına izin veriyor musunuz?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Konum bilgisinin doğruluğunu artırmak ve diğer amaçlar için, <xliff:g id="APP_NAME">%1$s</xliff:g> Kablosuz bağlantı kapalı olduğunda bile ağ tarama işlevini açmak istiyor.\n\nTarama yapmak isteyen tüm uygulamaların bu işlevi kullanmalarına izin veriyor musunuz?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"İzin ver"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Reddet"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Bağlan"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"UYARI: Ek operatör veri ücretleri alınabilir.\n\nTabletin kurulumu önemli miktarda ağ etkinliği gerektirebilir."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"UYARI: Ek operatör veri ücretleri alınabilir.\n\nTelefonun kurulumu önemli miktarda ağ etkinliği gerektirebilir."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"UYARI: İnternet bağlantınız olmadan tabletiniz yazılımlarınızın güncel olup olmadığını doğrulayamaz."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"UYARI: İnternet bağlantınız olmadan telefonunuz yazılımlarınızın güncel olup olmadığını doğrulayamaz."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet bu Kablosuz ağa bağlanamadı."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN kodu"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Yanlış PIN"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN\'ler eşleşmiyor"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"PIN değiştirilemiyor."\n"PIN yanlış olabilir."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"PIN değiştirilemiyor.\nPIN yanlış olabilir."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN kodu başarıyla değiştirildi"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM kartın kilit durumu değiştirilemiyor."\n"PIN yanlış olabilir."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"SIM kartın kilit durumu değiştirilemiyor.\nPIN yanlış olabilir."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"Tamam"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"İptal"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Tabletin durumu"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Fabrika verilerine sıfırla"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Tabletteki tüm verileri siler"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Telefondaki tüm verileri siler"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Bu işlem tablet bilgisayarınızın "<b>"dahili depolama alanından"</b>"şu verilerin tümünü siler:"\n\n<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Bu işlem, telefonunuzun "<b>"dahili depolama alanından"</b>" şu verilerin tümünü siler:"\n\n<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Şu anda aşağıdaki hesaplarda oturum açmış durumdasınız:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Bu işlem tablet bilgisayarınızın "<b>"dahili depolama alanından"</b>"şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Bu işlem, telefonunuzun "<b>"dahili depolama alanından"</b>" şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Şu anda aşağıdaki hesaplarda oturum açmış durumdasınız:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Müzik"</li>\n<li>"Fotoğraflar"</li>\n<li>"Diğer kullanıcı verileri"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"USB belleğin"</b>" silinmesi gerekir."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"SD kartın"</b>" silinmesi gerekir."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Önbllğe alınan işlm göstr"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Uygulama tercihlerini sıfırla"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Uygulama tercihleri sıfırlansın mı?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Bu işlem şunlar için tüm tercihleri sıfırlar:"\n\n" "<li>"Devre dışı uygulamalar"</li>\n" "<li>"Devre dışı uygulama bildirimleri"</li>\n" "<li>"İşlemler için varsayılan uygulamalar"</li>\n" "<li>"Uygulamalar için arka plan sınırlandırmaları"</li>\n\n" Hiçbir uygulama verisi kaybolmaz."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Bu işlem şunlar için tüm tercihleri sıfırlar:\n\n "<li>"Devre dışı uygulamalar"</li>\n" "<li>"Devre dışı uygulama bildirimleri"</li>\n" "<li>"İşlemler için varsayılan uygulamalar"</li>\n" "<li>"Uygulamalar için arka plan sınırlandırmaları"</li>\n\n" Hiçbir uygulama verisi kaybolmaz."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Uygulamaları sıfırla"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Alanı yönet"</string>
     <string name="filter" msgid="2018011724373033887">"Filtre"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Değiştirmek için Ctrl-Ara Çubuğu\'na basın"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Varsayılan"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Klavye düzenleri"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Kullanıcı sözlüğü"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Kişisel sözlük"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Kişisel sözlükler"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Kişisel sözlük"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Ekle"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Sözlüğe ekle"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Güç menüsünde hata raporunu alma seçeneğini dahil et"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Uyanık kal"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Şarj edilirken ekran hiçbir zaman uykuya geçmez"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI araştırma günlüğü özelliğini etkinleştir"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Bir dosyadaki tüm Bluetooth HCI paketlerini yakala"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Çalışma zamanını seçin"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Çalışma zamanını seçin"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Çalışma zamanını <xliff:g id="OLD">%1$s</xliff:g> yerine <xliff:g id="NEW">%2$s</xliff:g> olarak değiştirmek için yeniden başlatılsın mı?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Sahte konumlara izin ver"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Sahte konumlara izin ver"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB hata ayıklamasına izin verilsin mi?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USB belleği koru"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Uygulamalar USB belleği okumak için izin istemelidir"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"USB bellek korunsun mu?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"USB bellek korumalı olduğunda, uygulamaların harici depolama biriminden veri okumak için izin istemeleri gerekir."\n\n"Bazı uygulamalar, geliştiricileri tarafından güncellenene kadar çalışmayabilir."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"USB bellek korumalı olduğunda, uygulamaların harici depolama biriminden veri okumak için izin istemeleri gerekir.\n\nBazı uygulamalar, geliştiricileri tarafından güncellenene kadar çalışmayabilir."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"SD kartı koru"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Uygulamalar SD kartı okumak için izin istemelidir"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"SD kart korunsun mu?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SD kart korumalı olduğunda, uygulamaların harici depolama biriminden veri okumak için izin istemeleri gerekir."\n\n"Bazı uygulamalar, geliştiricileri tarafından güncellenene kadar çalışmayabilir."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SD kart korumalı olduğunda, uygulamaların harici depolama biriminden veri okumak için izin istemeleri gerekir.\n\nBazı uygulamalar, geliştiricileri tarafından güncellenene kadar çalışmayabilir."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Yerel terminal"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Yerel kabuk erişimi sunan terminal uygulamasını etkinleştir"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Gadget seç"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Widget seç"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Widget\'ı oluşturup erişime izin vermek istiyor musunuz?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Hizmetler"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistem"</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_screen_magnification_summary" msgid="2380627654189671754">"Bu özellik açıldığında ekrana üç kez hafifçe vurarak görüntüyü yakınlaştırabilir ve uzaklaştırabilirsiniz.\n\nYakınlaştırdığınızda şunları yapabilirsiniz\n"<ul><li>"Kaydırma: İki veya daha fazla parmağınızı ekranda sürükleyin."</li>\n<li>"Yakınlaştırrma düzeyini ayarlama: İki veya daha fazla parmağınızı birbirine yaklaştırın veya uzaklaştırın."</li></ul>\n\n"Ayrıca, üç kez hafifçe vurup parmağınızı basılı tutarak parmağınızın altındakini geçici olarak büyütebilirsiniz. Önceki duruma dönmek için parmağınızı kaldırın.\n\nNot: Üç kez hafifçe vurarak büyütme özelliği klavye ve gezinme çubuğu hariç her yerde kullanılabilir."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Erişilebilirlik kısayolu"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Açık"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Kapalı"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Bu özellik açıldığında, erişilebilirlik özelliklerini iki adımda kolayca etkinleştirebilirsiniz:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Bu özellik açıldığında, erişilebilirlik özelliklerini iki adımda kolayca etkinleştirebilirsiniz:\n\n1. Adım: Bir ses duyana veya titreşim hissedene kadar güç düğmesini basılı tutun.\n\n2. Adım: İki parmağınızla dokunup sesli bir onay duyana kadar parmaklarınızı basılı tutun.\n\nCihazda birden fazla kullanıcı varsa, kilit ekranında bu kısayol kullanıldığında erişilebilirlik özelliği cihazın kilidi açılana kadar geçici olarak etkinleştirilir."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Büyük metin"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ekran büyütme"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekran büyütmeyi otomatik güncelle"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack, görme engelli veya az gören kullanıcılara yardımcı olmak için sesli geri bildirim sağlar. Bu uygulamayı Android Market\'ten ücretsiz olarak yüklemek ister misiniz?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Hiçbir açıklama sağlanmadı."</string>
     <string name="settings_button" msgid="3006713718908152930">"Ayarlar"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Yazdırma"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Yazdırma ayarları"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Hizmetler"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"<xliff:g id="SERVICE">%1$s</xliff:g> kullanılsın mı?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> yazdırdığınız dokümanları alabilir. Bu tür dokümanlar hassas veriler içerebilir."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Hiçbir hizmet yüklenmedi"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Ayarlar"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Yazıcı ekle"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Açık"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Kapalı"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Pil"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Pili ne kullanıyor?"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Pil kullanım verisi yok."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Kablosuz çalışıyor"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Gönderilen veriler"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Alınan veriler"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Mobil veri gönderildi"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Mobil veri alındı"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Kablosuz verisi gönderildi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Kablosuz verisi alındı"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Ses"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Açma zamanı"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Perde"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Konuşulan metnin sesini etkiler"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Dil"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Dil seçilmedi"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Dil için tanımlı sesi, konuşulan metin için ayarlar"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Bir örnek dinleyin"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Konuşma sentezinin kısa bir sunumunu çal"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP desteklenmiyor."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Kurulum sırasında EAP Kablosuz bağlantısı yapılandıramazsınız. Kurulumdan sonra bunu, Ayarlar &gt; Kablosuz ve ağlar bölümünde yapabilirsiniz."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Bağlanma birkaç dakika sürebilir..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Kuruluma devam etmek için "<b>"İleri"</b>"\'ye dokunun."\n\n"Farklı bir Kablosuz ağa bağlanmak için "<b>"Geri"</b>"\'ye dokunun."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Kuruluma devam etmek için "<b>"İleri"</b>"\'ye dokunun.\n\nFarklı bir Kablosuz ağa bağlanmak için "<b>"Geri"</b>"\'ye dokunun."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Senkronizasyon etkinleştirildi"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Senkronizasyon devre dışı"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Senkronizasyon hatası"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"GPU fazla çizim hatasını ayıkla"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW katmanlarını devre dışı bırak"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Ekran oluştururken her zaman GPU\'yu kullan"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL izlerini etkinleştir"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Mobil ağlarda arka plan verilerini devre dışı bırak. Varsa mobil olmayan ağlar kullanılır."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Bu uygulama için arka plan verilerini sınırlamak üzere önce bir mobil veri sınırı belirleyin."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Arka plan verileri kısıtlansın mı?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Bu özellik, arka plan verilere dayanan bir uygulamanın, yalnızca mobil ağlar mevcut olması durumunda çalışmayı durdurmasına neden olabilir."\n\n"Daha uygun veri kullanım denetimlerini uygulamanın içindeki ayarlarda bulabilirsiniz."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Bu özellik, arka plan verilere dayanan bir uygulamanın, yalnızca mobil ağlar mevcut olması durumunda çalışmayı durdurmasına neden olabilir.\n\nDaha uygun veri kullanım denetimlerini uygulamanın içindeki ayarlarda bulabilirsiniz."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Arka plan verilerini sınırlama özelliği, yalnızca mobil ağ veri sınırı ayarladığınızda kullanılabilir."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Otomatik veri senk. açılsın mı?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Web üzerinden hesaplarınızda yaptığınız tüm değişiklikler tabletinize otomatik olarak kopyalanır"\n\n"Bazı hesaplar ayrıca tablette yaptığınız değişiklikleri de Web\'e otomatik olarak kopyalar. Google Hesapları bu şekilde çalışır. "\n\n"Her hesapla ne tür bilgileri senkronize edeceğinizi seçmek için Ayarlar &gt; Hesaplar\'a gidin."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Web üzerinden hesaplarınızda yaptığınız tüm değişiklikler telefonunuza otomatik olarak kopyalanır"\n\n"Bazı hesaplar telefonda yaptığınız değişiklikleri de Web\'e otomatik olarak kopyalar. Google Hesapları bu şekilde çalışır. "\n\n"Her hesapla ne tür bilgileri senkronize edeceğinizi seçmek için Ayarlar &gt; Hesaplar\'a gidin."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Web üzerinden hesaplarınızda yaptığınız tüm değişiklikler tabletinize otomatik olarak kopyalanır\n\nBazı hesaplar ayrıca tablette yaptığınız değişiklikleri de Web\'e otomatik olarak kopyalar. Google Hesapları bu şekilde çalışır. \n\nHer hesapla ne tür bilgileri senkronize edeceğinizi seçmek için Ayarlar &gt; Hesaplar\'a gidin."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Web üzerinden hesaplarınızda yaptığınız tüm değişiklikler telefonunuza otomatik olarak kopyalanır\n\nBazı hesaplar telefonda yaptığınız değişiklikleri de Web\'e otomatik olarak kopyalar. Google Hesapları bu şekilde çalışır. \n\nHer hesapla ne tür bilgileri senkronize edeceğinizi seçmek için Ayarlar &gt; Hesaplar\'a gidin."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Otomatik veri senk. kapatılsın mı?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Bu işlem veri ve pil kullanımını azaltır, ancak son bilgileri almak için her hesabı manuel olarak senkronize etmeniz gerekecektir. Ayrıca, güncelleme olduğunda da bildirim alamayacaksınız."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Kullanım dönemi sıfırlama tarihi"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Veri kullanım uyarısını ayarla"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Veri kullanım limitini ayarla"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Veri kullanımını sınırlama"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Belirtilen limite ulaşıldığında mobil veri bağlantınız kesilecektir."\n\n"Veri kullanımı tabletiniz tarafından ölçüldüğünden operatörünüzün kullanım hesaplaması farklı olabilir. Bu nedenle, risk almadan güvenli bir limit belirleyin."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Belirtilen limite ulaşıldığında mobil veri bağlantınız kesilecektir."\n\n"Veri kullanımı telefonunuz tarafından ölçüldüğünden operatörünüzün kullanım hesaplaması farklı olabilir. Bu nedenle, risk almadan güvenli bir limit belirleyin."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Belirtilen limite ulaşıldığında mobil veri bağlantınız kesilecektir.\n\nVeri kullanımı tabletiniz tarafından ölçüldüğünden operatörünüzün kullanım hesaplaması farklı olabilir. Bu nedenle, risk almadan güvenli bir limit belirleyin."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Belirtilen limite ulaşıldığında mobil veri bağlantınız kesilecektir.\n\nVeri kullanımı telefonunuz tarafından ölçüldüğünden operatörünüzün kullanım hesaplaması farklı olabilir. Bu nedenle, risk almadan güvenli bir limit belirleyin."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Arka plan verileri kısıtlansın mı?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Arka planda mobil veri kullanımını kısıtlarsanız, Kablosuz bir ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmaz."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Arka planda mobil veri kullanımını kısıtlarsanız, Kablosuz bir ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmaz."\n\n"Bu ayar, bu tabletteki tüm kullanıcıları etkiler."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Arka planda mobil veri kullanımını kısıtlarsanız, Kablosuz bir ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmaz."\n\n"Bu ayar, bu telefondaki tüm kullanıcıları etkiler."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Arka planda mobil veri kullanımını kısıtlarsanız, Kablosuz bir ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmaz.\n\nBu ayar, bu tabletteki tüm kullanıcıları etkiler."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Arka planda mobil veri kullanımını kısıtlarsanız, Kablosuz bir ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmaz.\n\nBu ayar, bu telefondaki tüm kullanıcıları etkiler."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"uyarı"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"sınır"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Kaldırılan uygulamalar"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Kullanıcı"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Kısıtlı profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Yeni kullanıcı ekle"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Ek kullanıcılar yaratarak bu cihazı başka kişilerle paylaşabilirsiniz. Her kullanıcının kendine ait alanı olur ve bu alanı kendi uygulamaları, duvar kâğıdı vb. ile özelleştirebilir. Kullanıcılar, Kablosuz bağlantı gibi herkesi etkileyebilecek tablet ayarlarını da yapabilirler."\n\n"Yeni bir kullanıcı oluşturduğunuzda, o kişinin bir kurulum işlemini tamamlaması gerekir."\n\n"Herhangi bir kullanıcı, güncellenen uygulama izinlerini diğer kullanıcıların adına kabul edebilir."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"Yeni bir kullanıcı oluşturduktan sonra, o kişinin bir kurulum işlemini tamamlaması gerekir."\n\n"Herhangi bir kullanıcı, güncellenen uygulama izinlerini diğer kullanıcıların adına kabul edebilir."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Ek kullanıcılar yaratarak bu cihazı başka kişilerle paylaşabilirsiniz. Her kullanıcının kendine ait alanı olur ve bu alanı kendi uygulamaları, duvar kâğıdı vb. ile özelleştirebilir. Kullanıcılar, Kablosuz bağlantı gibi herkesi etkileyebilecek tablet ayarlarını da yapabilirler.\n\nYeni bir kullanıcı oluşturduğunuzda, o kişinin bir kurulum işlemini tamamlaması gerekir.\n\nHerhangi bir kullanıcı, güncellenen uygulama izinlerini diğer kullanıcıların adına kabul edebilir."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Yeni bir kullanıcı oluşturduktan sonra, o kişinin bir kurulum işlemini tamamlaması gerekir.\n\nHerhangi bir kullanıcı, güncellenen uygulama izinlerini diğer kullanıcıların adına kabul edebilir."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Kullanıcı şimdi yapılandırılsın mı?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"İlgili kişinin tableti almak ve kendi alanının kurulumunu yapmak için müsait olduğundan emin olun"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Profil şimdi yapılandırılsın mı?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Bu ayar bu telefondaki tüm kullanıcıları etkiler."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Dili değiştir"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Yazı tipi boyutunu değiştir"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Kısıtlamalar"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Kısıtlamaları kaldır"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"PIN\'i değiştir"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Bildirimleri göster"</string>
     <string name="help_label" msgid="1107174367904110532">"Yardım"</string>
     <string name="user_account_title" msgid="1127193807312271167">"İçerik için kullanılan hesap"</string>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 86ed51b77e8..664e6781629 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Місцезнаходження"</item>
     <item msgid="255608127647030286">"Особисті дані"</item>
     <item msgid="4588829735729884491">"Повідомлення"</item>
-    <item msgid="8971765125227378270">"Пристрій"</item>
+    <item msgid="886742181977884584">"Медіа-файли"</item>
+    <item msgid="7924928667052300589">"Пристрій"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"приблизне місцезнаходження"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"відтворювати аудіо"</item>
     <item msgid="8374996688066472414">"читати буфер обміну"</item>
     <item msgid="3045529469061083747">"змінювати буфер обміну"</item>
+    <item msgid="5124443975763747838">"кнопки медіа"</item>
+    <item msgid="4547883971364273343">"активізація звуку"</item>
+    <item msgid="2603878814882344450">"загальна гучність"</item>
+    <item msgid="7136963238377062018">"гучність голосу"</item>
+    <item msgid="4270236897655923007">"гучність дзвінка"</item>
+    <item msgid="6325739889222559394">"гучність медіа"</item>
+    <item msgid="5762123934816216821">"гучність сигналу"</item>
+    <item msgid="785049718065337473">"гучність сповіщення"</item>
+    <item msgid="6700305533746877052">"гучність Bluetooth"</item>
+    <item msgid="2029227495214047094">"залишати активним"</item>
+    <item msgid="26109888160231211">"відстежувати місцезнаходження"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Місцезнаходження"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Відтворювати аудіо"</item>
     <item msgid="136815868796597058">"Читати буфер обміну"</item>
     <item msgid="5238692940326972503">"Змінювати буфер обміну"</item>
+    <item msgid="5753789168376302997">"Кнопки медіа"</item>
+    <item msgid="3265262911688671938">"Активізація звуку"</item>
+    <item msgid="2098976479485046797">"Загальна гучність"</item>
+    <item msgid="5660213838861789350">"Гучність голосу"</item>
+    <item msgid="7983336752371254444">"Гучність дзвінка"</item>
+    <item msgid="7878027809189330917">"Гучність медіа"</item>
+    <item msgid="7260546305036218513">"Гучність сигналу"</item>
+    <item msgid="9103719301075748925">"Гучність сповіщення"</item>
+    <item msgid="7025966722295861512">"Гучність Bluetooth"</item>
+    <item msgid="4665183401128289653">"Залишати активним"</item>
+    <item msgid="8584357129746649222">"Місцезнаходження"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Коротка"</item>
     <item msgid="2560532955514699713">"Середня"</item>
     <item msgid="2372711992605524591">"Довга"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (налагодження)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Використовувати Dalvik"</item>
+    <item msgid="5131846588686178907">"Використовувати ART"</item>
+    <item msgid="4530003713865319928">"Використовувати складання ART для налагодження"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Ніколи не перевіряти"</item>
     <item msgid="6042769699089883931">"Перевір. лише на вміст, захищ. DRM"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"На екрані у вигляді ліній"</item>
     <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Вимк."</item>
+    <item msgid="7688197031296835369">"Показувати області накладання"</item>
+    <item msgid="8332661909019981149">"Показувати лічильник накладання"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартне обмеження"</item>
     <item msgid="4071574792028999443">"Без фонових процесів"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index de4af9ea1a3..06ec899b4ae 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -275,8 +275,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_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>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Вимагає введення цифрового PIN-коду чи пароля для шифрування пристрою щоразу при його ввімкненні"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Вимагає введення цифрового PIN-коду чи пароля для шифрування телефону щоразу при його ввімкненні"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Зашифровано"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їх дані, медіа-файли й інші файли. Щойно ви зашифруєте свій планшетний ПК, потрібно буде вводити цифровий PIN-код чи пароль для розшифрування планшетного ПК щоразу під час його ввімкнення. Ви зможете скасувати шифрування, лише відновивши заводські налаштування, що призведе до видалення всіх ваших даних."\n\n"Шифрування триває не менше години. Перш ніж розпочати процес шифрування, переконайтеся, що акумулятор заряджено. Планшетний ПК має перебувати в підключеному стані до завершення шифрування. Переривання процесу шифрування призведе до втрати частини чи всіх ваших даних."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їх дані, медіа-файли й інші файли. Щойно ви зашифруєте свій телефон, потрібно буде вводити цифровий PIN-код чи пароль для розшифрування телефону щоразу під час його ввімкнення. Ви зможете скасувати шифрування, лише відновивши заводські налаштування, що призведе до видалення всіх ваших даних."\n\n"Шифрування триває не менше години. Перш ніж розпочати процес шифрування, переконайтеся, що акумулятор заряджено. Телефон має перебувати в підключеному стані до завершення шифрування. Переривання процесу шифрування призведе до втрати частини чи всіх ваших даних."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їх дані, медіа-файли й інші файли. Щойно ви зашифруєте свій планшетний ПК, потрібно буде вводити цифровий PIN-код чи пароль для розшифрування планшетного ПК щоразу під час його ввімкнення. Ви зможете скасувати шифрування, лише відновивши заводські налаштування, що призведе до видалення всіх ваших даних.\n\nШифрування триває не менше години. Перш ніж розпочати процес шифрування, переконайтеся, що акумулятор заряджено. Планшетний ПК має перебувати в підключеному стані до завершення шифрування. Переривання процесу шифрування призведе до втрати частини чи всіх ваших даних."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їх дані, медіа-файли й інші файли. Щойно ви зашифруєте свій телефон, потрібно буде вводити цифровий PIN-код чи пароль для розшифрування телефону щоразу під час його ввімкнення. Ви зможете скасувати шифрування, лише відновивши заводські налаштування, що призведе до видалення всіх ваших даних.\n\nШифрування триває не менше години. Перш ніж розпочати процес шифрування, переконайтеся, що акумулятор заряджено. Телефон має перебувати в підключеному стані до завершення шифрування. Переривання процесу шифрування призведе до втрати частини чи всіх ваших даних."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Шифрувати пристрій"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Шифрувати телефон"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Зарядіть акумулятор і повторіть спробу."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Спробуйте ще через <xliff:g id="DELAY">^1</xliff:g> сек."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Введіть пароль"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифрування не виконано"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шифрування перервано, його неможливо закінчити. Як наслідок, дані на планшетному ПК більше не доступні. "\n\n"Щоб знову користуватися планшетним ПК, потрібно відновити заводські налаштування. Налаштовуючи планшетний ПК після відновлення, ви матимете можливість відновити будь-які дані, резервні копії яких було збережено у вашому обліковому записі Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шифрування перервано, його неможливо закінчити. Як наслідок, дані на телефоні більше не доступні. "\n\n"Щоб знову користуватися телефоном, потрібно відновити заводські налаштування. Налаштовуючи телефон після відновлення, ви матимете можливість відновити будь-які дані, резервні копії яких було збережено у вашому обліковому записі Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Шифрування перервано, його неможливо закінчити. Як наслідок, дані на планшетному ПК більше не доступні. \n\nЩоб знову користуватися планшетним ПК, потрібно відновити заводські налаштування. Налаштовуючи планшетний ПК після відновлення, ви матимете можливість відновити будь-які дані, резервні копії яких було збережено у вашому обліковому записі Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Шифрування перервано, його неможливо закінчити. Як наслідок, дані на телефоні більше не доступні. \n\nЩоб знову користуватися телефоном, потрібно відновити заводські налаштування. Налаштовуючи телефон після відновлення, ви матимете можливість відновити будь-які дані, резервні копії яких було збережено у вашому обліковому записі Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Переключити метод введення"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Тип блокув. екрана"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Вибер. резерв. блокув."</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Під’єднуються"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Під’єднані"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Доступні"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Використовується"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Налаштування відображення"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Від’єднатися?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Це призведе до роз’єднання з пристроєм:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,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="8850161330437693895">"Wi‑Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Захищено: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", захищено: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Немає"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Щоб покращити точність даних про місцезнаходження, а також для інших цілей, програма <xliff:g id="APP_NAME">%1$s</xliff:g> хоче вмикати сканування мережі, навіть коли Wi-Fi вимкнено."\n\n"Дозволити це для всіх програм, які потребують сканування?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Щоб покращити точність даних про місцезнаходження, а також для інших цілей, програма <xliff:g id="APP_NAME">%1$s</xliff:g> хоче вмикати сканування мережі, навіть коли Wi-Fi вимкнено.\n\nДозволити це для всіх програм, які потребують сканування?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дозволити"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Відхилити"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Підключ."</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"ЗАСТЕРЕЖЕННЯ. Оператор може стягувати з вас додаткову плату.\n\nДля налаштування планшетного ПК може знадобитися тривале користування мережею."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ЗАСТЕРЕЖЕННЯ. Оператор може стягувати з вас додаткову плату.\n\nДля налаштування телефону може знадобитися тривале користування мережею."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ЗАСТЕРЕЖЕННЯ. Якщо немає з’єднання з Інтернетом, планшетний ПК не зможе перевірити, чи оновлено ваше програмне забезпечення."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ЗАСТЕРЕЖЕННЯ. Якщо немає з’єднання з Інтернетом, телефон не зможе перевірити, чи оновлено ваше програмне забезпечення."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Планшетний ПК не зміг під’єднатися до цієї мережі Wi-Fi."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"PIN SIM-карти"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Неправильний PIN-код"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN-коди не збігаються"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Неможливо змінити PIN-код."\n"Можливо, неправильний PIN-код."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Неможливо змінити PIN-код.\nМожливо, неправильний PIN-код."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN SIM-карти успішно змінено"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Неможливо змінити стан блокування SIM-карти."\n"Можливо, неправильний PIN-код."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Неможливо змінити стан блокування SIM-карти.\nМожливо, неправильний PIN-код."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Скасувати"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Стан пристрою"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Відновл. завод. налаштув."</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Видаляє всі дані в пристрої"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Видаляє всі дані в телефоні"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Це зітре всі дані з "<b>"внутрішньої пам’яті"</b>" вашого планшетного ПК, зокрема:"\n\n<li>"ваш обліковий запис Google"</li>\n<li>"дані й налаштування системи та програм"</li>\n<li>"завантажені програми"</li>"."</string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Це видалить усі дані з "<b>"внутрішньої пам’яті"</b>" вашого телефону, зокрема:"\n\n<li>"ваш обліковий запис Google"</li>\n<li>"дані й налаштування системи та програм"</li>\n<li>"завантажені програми"</li>"."</string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Наразі ви ввійшли в такі облікові записи:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Це зітре всі дані з "<b>"внутрішньої пам’яті"</b>" вашого планшетного ПК, зокрема:\n\n"<li>"ваш обліковий запис Google"</li>\n<li>"дані й налаштування системи та програм"</li>\n<li>"завантажені програми"</li>"."</string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Це видалить усі дані з "<b>"внутрішньої пам’яті"</b>" вашого телефону, зокрема:\n\n"<li>"ваш обліковий запис Google"</li>\n<li>"дані й налаштування системи та програм"</li>\n<li>"завантажені програми"</li>"."</string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Наразі ви ввійшли в такі облікові записи:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Фото"</li>\n<li>"Інші дані користувача"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Щоб видалити музику, зображення й інші дані користувача, треба стерти "<b>"носій USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Щоб видалити музику, зображення й інші дані користувача, треба стерти "<b>"карту SD"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Показати кешовані процеси"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Скинути налашт-ня програм"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Скинути налашт. програм?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ця дія скине всі налаштування для:"\n\n" "<li>"вимкнених програм"</li>\n" "<li>"вимкнених сповіщень програм"</li>\n" "<li>"дій у програмах за умовчанням"</li>\n" "<li>"обмежень щодо фонових даних для програм"</li>\n\n" Жодні дані програм не буде втрачено."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Ця дія скине всі налаштування для:\n\n "<li>"вимкнених програм"</li>\n" "<li>"вимкнених сповіщень програм"</li>\n" "<li>"дій у програмах за умовчанням"</li>\n" "<li>"обмежень щодо фонових даних для програм"</li>\n\n" Жодні дані програм не буде втрачено."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Скинути програми"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Кер. простором"</string>
     <string name="filter" msgid="2018011724373033887">"Фільтрув."</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Щоб переключити, натис. Ctrl–Пробіл"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"За умовчанням"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Розкладки клавіатури"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Словник корист-ча"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Особистий словник"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Особисті словники"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Особистий словник"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Додати"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Додати до словника"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Внести в меню \"Живлення\" опцію створення повідомлень про помилку"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Залишати активним"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Екран не засинатиме під час заряджання"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Увімкнути журнал відстеження інтерфейсу Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Робити знімки всіх пакетів інтерфейсу Bluetooth у файлі"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Вибрати робочий цикл"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Вибрати робочий цикл"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Перезавантажити, щоб змінити робочий цикл із <xliff:g id="OLD">%1$s</xliff:g> на <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Фіктивні місцезнаходження"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Дозв. фіктивні місцезн."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Дозвол. налагодж. USB?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Захистити носій USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Програми мають запитувати дозвіл на читання носія USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Захистити носій USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Якщо носій USB захищено, програми мають запитувати дозвіл на читання даних із зовнішньої пам’яті."\n\n"Деякі програми можуть не працювати до оновлення своїми розробниками."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Якщо носій USB захищено, програми мають запитувати дозвіл на читання даних із зовнішньої пам’яті.\n\nДеякі програми можуть не працювати до оновлення своїми розробниками."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Захистити карту SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Програми мають запитувати дозвіл на читання карти SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Захистити карту SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Якщо карту SD захищено, програми мають запитувати дозвіл на читання даних із зовнішньої пам’яті."\n\n"Деякі програми можуть не працювати до оновлення своїми розробниками."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Якщо карту SD захищено, програми мають запитувати дозвіл на читання даних із зовнішньої пам’яті.\n\nДеякі програми можуть не працювати до оновлення своїми розробниками."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Локальний термінал"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Увімк. програму-термінал, що надає локальний доступ до оболонки"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Вибрати віджет"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Вибрати віджет"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Створити віджет і дозволити доступ?"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Служби"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Жести збільшення"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Якщо цю функцію ввімкнено, масштаб можна змінювати, тричі торкнувшись екрана."\n\n"У збільшеному масштабі можна:"\n<ul><li>"панорамувати – проведіть принаймні двома пальцями по екрану;"</li>\n<li>"налаштовувати рівень масштабування – стисніть або розведіть принаймні два пальці."</li></ul>\n\n"Можна також тимчасово збільшувати вміст під пальцем – тричі торкніться й утримуйте. У такому збільшеному стані можна досліджувати різні частини екрана, пересуваючи палець. Підніміть палець, щоб повернутися до попереднього стану."\n\n"Примітка. Потрійний дотик для збільшення працює всюди, окрім клавіатури та панелі навігації."</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_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>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Функція TalkBack забезпечує мовне голосове відтворення для користувачів із вадами зору. Хочете встановити її безкоштовно з Android Market?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Немає опису."</string>
     <string name="settings_button" msgid="3006713718908152930">"Налаштування"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Друк"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Налаштування друку"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Служби"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Використовувати <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> отримуватиме документи, які ви друкуєте. Такі документи можуть містити конфіденційну інформацію."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Не встановлено жодну службу"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Налаштування"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Додати принтери"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Увімк."</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Вимк."</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Акумулятор"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"На що споживається заряд акумулятора"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Дані використання акумулятора недоступні"</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi працює"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Пристрій"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Телефон"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Надісл. дані"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Отримані дані"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Мобільні дані надіслано"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Мобільні дані отримано"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Дані Wi‑Fi надіслано"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Дані Wi‑Fi отримано"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Звук"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Відео"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Час роботи"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Вис. зв."</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Впливає на тон відтворюваного тексту"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Мова"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Мову не вибрано"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Устан. голос для відтворюваного тексту залежно від мови"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Прослухайте приклад"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Відтворити коротку демонстрацію синтезу мови"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP не підтримується."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Під час налаштування неможливо встановити параметри з’єднання Wi‑Fi через протокол EAP. Це можна зробити після налаштування в меню Налаштування &gt; Бездротовий зв’язок і мережі."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Під’єднання може тривати кілька хвилин..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Торкніться опції "<b>"Далі"</b>", щоб продовжити налаштування."\n\n"Торкніться опції "<b>"Назад"</b>", щоб під’єднатися до іншої мережі Wi‑Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Торкніться опції "<b>"Далі"</b>", щоб продовжити налаштування.\n\nТоркніться опції "<b>"Назад"</b>", щоб під’єднатися до іншої мережі Wi‑Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Синхронізацію ввімкнено"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синхронізацію вимкнено"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Помилка синхронізації"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Налагодити накладання GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Вимк. апаратн. накладання"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Завжди використовувати GPU для компонування екрана"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Увімк. трасування OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Вимикати фонові дані в мобільних мережах. Використов. не мобільні мережі, якщо доступно."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Щоб обмеж.фонові дані для прогр., споч. встанов.ліміт моб.даних."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Обмежити використання фонових даних?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Якщо доступні лише мобільні мережі, програми, що використовують фонові дані, можуть не працювати."\n\n"Відповідніші елементи керування використанням даних можна знайти в налаштуваннях цієї програми."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Якщо доступні лише мобільні мережі, програми, що використовують фонові дані, можуть не працювати.\n\nВідповідніші елементи керування використанням даних можна знайти в налаштуваннях цієї програми."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Обмеження фонових даних можливе, лише якщо встановлено ліміт мобільних даних."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Увімк. автосинхронізацію даних?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Будь-які зміни до облікових записів, внесені в Інтернеті, автоматично копіюватимуться на ваш планшетний ПК."\n\n"Деякі облікові записи також можуть автоматично копіювати в Інтернет зміни, внесені на планшетному ПК. Так працює обліковий запис Google."\n\n"Щоб вибрати типи інформації, які потрібно синхронізувати з обліковими записами, перейдіть у Налаштування &gt; Облікові записи."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Будь-які зміни до облікових записів, внесені в Інтернеті, автоматично копіюватимуться на ваш телефон."\n\n"Деякі облікові записи також можуть автоматично копіювати в Інтернет зміни, внесені на телефоні. Так працює обліковий запис Google."\n\n"Щоб вибрати типи інформації, які потрібно синхронізувати з обліковими записами, перейдіть у Налаштування &gt; Облікові записи."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Будь-які зміни до облікових записів, внесені в Інтернеті, автоматично копіюватимуться на ваш планшетний ПК.\n\nДеякі облікові записи також можуть автоматично копіювати в Інтернет зміни, внесені на планшетному ПК. Так працює обліковий запис Google.\n\nЩоб вибрати типи інформації, які потрібно синхронізувати з обліковими записами, перейдіть у Налаштування &gt; Облікові записи."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Будь-які зміни до облікових записів, внесені в Інтернеті, автоматично копіюватимуться на ваш телефон.\n\nДеякі облікові записи також можуть автоматично копіювати в Інтернет зміни, внесені на телефоні. Так працює обліковий запис Google.\n\nЩоб вибрати типи інформації, які потрібно синхронізувати з обліковими записами, перейдіть у Налаштування &gt; Облікові записи."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Вимк. автосинхронізацію даних?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Це заощаджуватиме використання даних і заряду акумулятора. Проте вам доведеться вручну синхронізувати кожен обліковий запис, щоб зібрати останні відомості. Ви також не отримуватимете сповіщення про оновлення."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Дата скидання циклу використання даних"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Установити застереження про використання даних"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Установити ліміт використання даних"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Обмежити використання даних"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Мобільне передавання даних буде вимкнено в разі досягнення вказаного ліміту."\n\n"Оскільки методи обліку використання даних планшетного ПК й оператора можуть відрізнятися, радимо використовувати занижений ліміт."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Мобільне передавання даних буде вимкнено в разі досягнення вказаного ліміту."\n\n"Оскільки методи обліку використання даних телефону й оператора можуть відрізнятися, радимо використовувати занижений ліміт."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Мобільне передавання даних буде вимкнено в разі досягнення вказаного ліміту.\n\nОскільки методи обліку використання даних планшетного ПК й оператора можуть відрізнятися, радимо використовувати занижений ліміт."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Мобільне передавання даних буде вимкнено в разі досягнення вказаного ліміту.\n\nОскільки методи обліку використання даних телефону й оператора можуть відрізнятися, радимо використовувати занижений ліміт."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Обмежити використання фонових даних?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Якщо обмежити мобільне передавання даних у фоновому режимі, деякі програми та служби працюватимуть лише під час з’єднання з мережею Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Якщо обмежити мобільне передавання даних у фоновому режимі, деякі програми та служби працюватимуть лише під час з’єднання з мережею Wi-Fi."\n\n"Таке налаштування впливає на всіх користувачів цього планшетного ПК."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Якщо обмежити мобільне передавання даних у фоновому режимі, деякі програми та служби працюватимуть лише під час з’єднання з мережею Wi-Fi."\n\n"Таке налаштування впливає на всіх користувачів цього телефону."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Якщо обмежити мобільне передавання даних у фоновому режимі, деякі програми та служби працюватимуть лише під час з’єднання з мережею Wi-Fi.\n\nТаке налаштування впливає на всіх користувачів цього планшетного ПК."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Якщо обмежити мобільне передавання даних у фоновому режимі, деякі програми та служби працюватимуть лише під час з’єднання з мережею Wi-Fi.\n\nТаке налаштування впливає на всіх користувачів цього телефону."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"застереження"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"максимум"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Видалені програми"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Користувач"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Профіль з обмеженням"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Додати нового користувача"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Щоб користуватися цим пристроєм спільно, потрібно створити додаткових користувачів. Кожен користувач має власну пам’ять, яку може використовувати для зберігання програм, фонових малюнків тощо. Користувачі також можуть налаштовувати певні параметри планшетного ПК, як-от Wi-Fi, які застосовуватимуться до решти користувачів."\n\n"Особа, для якої ви створили нового користувача, має здійснити процес налаштування."\n\n"Будь-який користувач може схвалювати дозволи на оновлення програм від імені інших користувачів."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"Особа, для якої ви створили нового користувача, має здійснити процес налаштування."\n\n"Будь-який користувач може схвалювати дозволи на оновлення програм від імені інших користувачів."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Щоб користуватися цим пристроєм спільно, потрібно створити додаткових користувачів. Кожен користувач має власну пам’ять, яку може використовувати для зберігання програм, фонових малюнків тощо. Користувачі також можуть налаштовувати певні параметри планшетного ПК, як-от Wi-Fi, які застосовуватимуться до решти користувачів.\n\nОсоба, для якої ви створили нового користувача, має здійснити процес налаштування.\n\nБудь-який користувач може схвалювати дозволи на оновлення програм від імені інших користувачів."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Особа, для якої ви створили нового користувача, має здійснити процес налаштування.\n\nБудь-який користувач може схвалювати дозволи на оновлення програм від імені інших користувачів."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Створити користувача зараз?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Новий користувач має взяти планшетний ПК та налаштувати свій простір"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Налаштувати профіль зараз?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Це налаштування впливає на всіх користувачів цього телефону."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Змінити мову"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Змінити розмір шрифту"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Обмеження"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Зняти обмеження"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Змінити PIN-код"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Показати сповіщення"</string>
     <string name="help_label" msgid="1107174367904110532">"Довідка"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Обліковий запис для вмісту"</string>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 82ff460aa3a..b44f15de2b4 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Vị trí"</item>
     <item msgid="255608127647030286">"Cá nhân"</item>
     <item msgid="4588829735729884491">"Nhắn tin"</item>
-    <item msgid="8971765125227378270">"Thiết bị"</item>
+    <item msgid="886742181977884584">"Truyền thông"</item>
+    <item msgid="7924928667052300589">"Thiết bị"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"vị trí tổng thể"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"phát âm thanh"</item>
     <item msgid="8374996688066472414">"đọc khay nhớ tạm"</item>
     <item msgid="3045529469061083747">"sửa đổi khay nhớ tạm"</item>
+    <item msgid="5124443975763747838">"các nút phương tiện truyền thông"</item>
+    <item msgid="4547883971364273343">"tập trung âm thanh"</item>
+    <item msgid="2603878814882344450">"âm lượng chính"</item>
+    <item msgid="7136963238377062018">"âm lượng thoại"</item>
+    <item msgid="4270236897655923007">"âm lượng chuông"</item>
+    <item msgid="6325739889222559394">"âm lượng phương tiện truyền thông"</item>
+    <item msgid="5762123934816216821">"âm lượng báo thức"</item>
+    <item msgid="785049718065337473">"âm lượng thông báo"</item>
+    <item msgid="6700305533746877052">"âm lượng bluetooth"</item>
+    <item msgid="2029227495214047094">"không khóa màn hình"</item>
+    <item msgid="26109888160231211">"giám sát vị trí"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Vị trí"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Phát âm thanh"</item>
     <item msgid="136815868796597058">"Đọc khay nhớ tạm"</item>
     <item msgid="5238692940326972503">"Sửa đổi khay nhớ tạm"</item>
+    <item msgid="5753789168376302997">"Các nút phương tiện"</item>
+    <item msgid="3265262911688671938">"Tập trung âm thanh"</item>
+    <item msgid="2098976479485046797">"Âm lượng chính"</item>
+    <item msgid="5660213838861789350">"Âm lượng thoại"</item>
+    <item msgid="7983336752371254444">"Âm lượng chuông"</item>
+    <item msgid="7878027809189330917">"Âm lượng phương tiện"</item>
+    <item msgid="7260546305036218513">"Âm lượng báo thức"</item>
+    <item msgid="9103719301075748925">"Âm lượng thông báo"</item>
+    <item msgid="7025966722295861512">"Âm lượng bluetooth"</item>
+    <item msgid="4665183401128289653">"Không khóa màn hình"</item>
+    <item msgid="8584357129746649222">"Vị trí"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Ngắn"</item>
     <item msgid="2560532955514699713">"Trung bình"</item>
     <item msgid="2372711992605524591">"Dài"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (gỡ lỗi)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Sử dụng Dalvik"</item>
+    <item msgid="5131846588686178907">"Sử dụng ART"</item>
+    <item msgid="4530003713865319928">"Sử dụng bản dựng gỡ lỗi ART"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Không bao giờ kiểm tra"</item>
     <item msgid="6042769699089883931">"Chỉ kiểm tra nội dung DRM"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Trên màn hình dưới dạng đường"</item>
     <item msgid="120512413928262547">"Trong adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Tắt"</item>
+    <item msgid="7688197031296835369">"Hiển thị các vùng vẽ quá"</item>
+    <item msgid="8332661909019981149">"Hiển thị bộ đo mức vẽ quá"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Giới hạn tiêu chuẩn"</item>
     <item msgid="4071574792028999443">"Không có quá trình nền"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 7a49a791a01..d851660e450 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Khi bạn cho phép chuyển vùng dữ liệu, bạn có thể phải trả khoản phí chuyển vùng đáng kể!\n\nCài đặt này ảnh hưởng đến tất cả người dùng trên máy tính bảng này."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Khi bạn cho phép chuyển vùng dữ liệu, bạn có thể phải trả khoản phí chuyển vùng đáng kể!\n\nCài đặt này ảnh hưởng đến tất cả người dùng trên điện thoại này."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Cho phép chuyển vùng dữ liệu?"</string>
     <string name="networks" msgid="6333316876545927039">"Chọn nhà cung cấp dịch vụ"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Chọn nhà cung cấp dịch vụ mạng"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Yêu cầu PIN số hoặc mật khẩu để giải mã điện thoại của bạn mỗi lần bạn bật điện thoại"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Yêu cầu PIN số hoặc mật khẩu để giải mã điện thoại của bạn mỗi lần bạn bật điện thoại"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Đã mã hóa"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống và dữ liệu, phương tiện của các ứng dụng đó cũng như các tệp khác của bạn. Sau khi mã hóa máy tính bảng, bạn cần nhập mã PIN số hoặc mật khẩu để giải mã mỗi lần bạn bật máy tính bảng: bạn không thể hủy mã hóa máy tính bảng trừ khi thiết lập lại dữ liệu ban đầu, xóa tất cả dữ liệu của bạn."\n\n"Quá trình mã hóa mất ít nhất một giờ. Bạn phải bắt đầu khi pin đã được sạc và vẫn cắm máy tính bảng cho tới khi quá trình mã hóa hoàn tất. Nếu làm gián đoạn quá trình mã hóa, bạn sẽ mất một số hoặc tất cả dữ liệu của bạn."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống và dữ liệu, phương tiện của các ứng dụng đó cũng như các tệp khác của bạn. Sau khi mã hóa điện thoại, bạn cần nhập mã PIN số hoặc mật khẩu để giải mã mỗi lần bạn bật điện thoại. Bạn không thể hủy mã hóa điện thoại trừ khi thiết lập lại dữ liệu ban đầu, xóa tất cả dữ liệu của bạn."\n\n"Quá trình mã hóa mất ít nhất một giờ. Bạn phải bắt đầu khi pin đã được sạc và vẫn cắm điện thoại cho tới khi quá trình mã hóa hoàn tất. Nếu làm gián đoạn quá trình mã hóa, bạn sẽ mất một số hoặc tất cả dữ liệu của bạn."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống và dữ liệu, phương tiện của các ứng dụng đó cũng như các tệp khác của bạn. Sau khi mã hóa máy tính bảng, bạn cần nhập mã PIN số hoặc mật khẩu để giải mã mỗi lần bạn bật máy tính bảng: bạn không thể hủy mã hóa máy tính bảng trừ khi thiết lập lại dữ liệu ban đầu, xóa tất cả dữ liệu của bạn.\n\nQuá trình mã hóa mất ít nhất một giờ. Bạn phải bắt đầu khi pin đã được sạc và vẫn cắm máy tính bảng cho tới khi quá trình mã hóa hoàn tất. Nếu làm gián đoạn quá trình mã hóa, bạn sẽ mất một số hoặc tất cả dữ liệu của bạn."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống và dữ liệu, phương tiện của các ứng dụng đó cũng như các tệp khác của bạn. Sau khi mã hóa điện thoại, bạn cần nhập mã PIN số hoặc mật khẩu để giải mã mỗi lần bạn bật điện thoại. Bạn không thể hủy mã hóa điện thoại trừ khi thiết lập lại dữ liệu ban đầu, xóa tất cả dữ liệu của bạn.\n\nQuá trình mã hóa mất ít nhất một giờ. Bạn phải bắt đầu khi pin đã được sạc và vẫn cắm điện thoại cho tới khi quá trình mã hóa hoàn tất. Nếu làm gián đoạn quá trình mã hóa, bạn sẽ mất một số hoặc tất cả dữ liệu của bạn."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Mã hóa máy tính bảng"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Mã hóa điện thoại"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Vui lòng sạc pin và thử lại."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Hãy thử lại sau <xliff:g id="DELAY">^1</xliff:g> giây."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Nhập mật khẩu của bạn"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Mã hóa không thành công"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Quá trình mã hóa đã bị gián đoạn và không thể hoàn tất. Do đó, dữ liệu trên máy tính bảng của bạn không còn có thể truy cập được. "\n\n" Để tiếp tục sử dụng máy tính bảng của mình, bạn cần đặt lại về cài đặt ban đầu. Khi bạn thiết lập máy tính bảng sau khi đặt lại, bạn sẽ có cơ hội khôi phục mọi dữ liệu được sao lưu vào Tài khoản Google của mình."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Quá trình mã hóa bị gián đoạn và không thể hoàn tất. Do đó, dữ liệu trên điện thoại của bạn không còn có thể truy cập được. "\n\n"Để tiếp tục sử dụng điện thoại của mình, bạn cần đặt lại về cài đặt ban đầu. Khi bạn thiết lập điện thoại sau khi đặt lại, bạn sẽ có cơ hội khôi phục mọi dữ liệu được sao lưu vào Tài khoản Google của mình."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Quá trình mã hóa đã bị gián đoạn và không thể hoàn tất. Do đó, dữ liệu trên máy tính bảng của bạn không còn có thể truy cập được. \n\n Để tiếp tục sử dụng máy tính bảng của mình, bạn cần đặt lại về cài đặt ban đầu. Khi bạn thiết lập máy tính bảng sau khi đặt lại, bạn sẽ có cơ hội khôi phục mọi dữ liệu được sao lưu vào Tài khoản Google của mình."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Quá trình mã hóa bị gián đoạn và không thể hoàn tất. Do đó, dữ liệu trên điện thoại của bạn không còn có thể truy cập được. \n\nĐể tiếp tục sử dụng điện thoại của mình, bạn cần đặt lại về cài đặt ban đầu. Khi bạn thiết lập điện thoại sau khi đặt lại, bạn sẽ có cơ hội khôi phục mọi dữ liệu được sao lưu vào Tài khoản Google của mình."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Chuyển phương thức nhập"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Chọn khóa màn hình"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Chọn khóa dự phòng"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Đang kết nối"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Đã kết nối"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Khả dụng"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Đang được sử dụng"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Cài đặt hiển thị"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Ngắt kết nối?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Tác vụ này sẽ kết thúc kết nối của bạn với:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Tắt"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Không khả dụng vì NFC bị tắt"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Khi tính năng này được bật, bạn có thể truyền nội dung ứng dụng vào thiết bị có khả năng NFC khác bằng cách giữ các thiết bị gần nhau. Ví dụ: bạn có thể truyền các trang Trình duyệt, video trên YouTube, danh sách liên hệ Người và nhiều thứ khác."\n\n"Chỉ cần đưa thiết bị gần nhau (thường quay lưng lại với nhau) rồi chạm vào màn hình của bạn. Ứng dụng xác định nội dung nào được truyền."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Khi tính năng này được bật, bạn có thể truyền nội dung ứng dụng vào thiết bị có khả năng NFC khác bằng cách giữ các thiết bị gần nhau. Ví dụ: bạn có thể truyền các trang Trình duyệt, video trên YouTube, danh sách liên hệ Người và nhiều thứ khác.\n\nChỉ cần đưa thiết bị gần nhau (thường quay lưng lại với nhau) rồi chạm vào màn hình của bạn. Ứng dụng xác định nội dung nào được truyền."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Khám phá dịch vụ mạng"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Cho phép ứng dụng trên các thiết bị khác khám phá ứng dụng trên thiết bị này"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Được bảo mật bằng <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", được bảo mật bằng <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Không"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Để nâng cao độ chính xác vị trí và phục vụ các mục đích khác, <xliff:g id="APP_NAME">%1$s</xliff:g> muốn bật tính năng quét mạng ngay cả khi Wi-Fi đang tắt."\n\n"Cho phép cài đặt này đối với tất cả ứng dụng muốn quét?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Để nâng cao độ chính xác vị trí và phục vụ các mục đích khác, <xliff:g id="APP_NAME">%1$s</xliff:g> muốn bật tính năng quét mạng ngay cả khi Wi-Fi đang tắt.\n\nCho phép cài đặt này đối với tất cả ứng dụng muốn quét?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Cho phép"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Từ chối"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Kết nối"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"CẢNH BÁO: Bạn có thể phải trả thêm phí dữ liệu cho nhà cung cấp dịch vụ.\n\nThiết lập máy tính bảng có thể yêu cầu hoạt động mạng đáng kể."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"CẢNH BÁO: Bạn có thể phải trả thêm phí dữ liệu cho nhà cung cấp dịch vụ.\n\nThiết lập điện thoại có thể yêu cầu hoạt động mạng đáng kể."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"CẢNH BÁO: Máy tính bảng sẽ không thể xác minh rằng phần mềm của bạn đã cập nhật cho đến khi bạn có kết nối internet."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"CẢNH BÁO: Điện thoại sẽ không thể xác minh rằng phần mềm của bạn đã cập nhật cho đến khi bạn có kết nối internet."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Máy tính bảng không thể kết nối với mạng Wi‑Fi này."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"Mã PIN của SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Mã PIN không chính xác"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Các mã PIN không khớp"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Không thể thay đổi mã PIN."\n"Có thể mã PIN không đúng."</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Không thể thay đổi mã PIN.\nCó thể mã PIN không đúng."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"Mã PIN của SIM đã được thay đổi thành công"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Không thể thay đổi trạng thái khóa thẻ SIM."\n"Có thể mã PIN không đúng."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Không thể thay đổi trạng thái khóa thẻ SIM.\nCó thể mã PIN không đúng."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Hủy"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Trạng thái của máy tính bảng"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Đặt lại về dữ liệu gốc"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Xóa tất cả dữ liệu trên máy tính bảng"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Xóa tất cả dữ liệu trên điện thoại"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tác vụ này sẽ xóa tất cả dữ liệu từ "<b>"bộ nhớ trong"</b>" của máy tính bảng, bao gồm:"\n\n<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu và cài đặt hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tác vụ này sẽ xóa tất cả dữ liệu từ "<b>"bộ nhớ trong"</b>" của điện thoại, bao gồm:"\n\n<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu và cài đặt hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Bạn hiện đã đăng nhập vào các tài khoản sau đây:"\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Tác vụ này sẽ xóa tất cả dữ liệu từ "<b>"bộ nhớ trong"</b>" của máy tính bảng, bao gồm:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu và cài đặt hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Tác vụ này sẽ xóa tất cả dữ liệu từ "<b>"bộ nhớ trong"</b>" của điện thoại, bao gồm:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu và cài đặt hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Bạn hiện đã đăng nhập vào các tài khoản sau đây:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Nhạc"</li>\n<li>"Ảnh"</li>\n<li>"Dữ liệu người dùng khác"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Để xóa nhạc, hình ảnh và dữ liệu người dùng khác, cần xóa "<b>"bộ lưu trữ USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Đồng thời, để xóa nhạc, hình ảnh và dữ liệu người dùng khác, cần xóa "<b>"thẻ"</b>"."</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Hiển thị quá trình đã được lưu trong bộ nhớ cache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Đặt lại tùy chọn ứng dụng"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Đặt lại tùy chọn ứng dụng?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Thao tác này sẽ đặt lại tất cả tùy chọn cho:"\n\n" "<li>"Ứng dụng đã tắt"</li>\n" "<li>"Thông báo ứng dụng đã tắt"</li>\n" "<li>"Ứng dụng mặc định cho tác vụ"</li>\n" "<li>"Hạn chế dữ liệu nền cho ứng dụng"</li>\n\n" Bạn sẽ mất mọi dữ liệu ứng dụng."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Thao tác này sẽ đặt lại tất cả tùy chọn cho:\n\n "<li>"Ứng dụng đã tắt"</li>\n" "<li>"Thông báo ứng dụng đã tắt"</li>\n" "<li>"Ứng dụng mặc định cho tác vụ"</li>\n" "<li>"Hạn chế dữ liệu nền cho ứng dụng"</li>\n\n" Bạn sẽ mất mọi dữ liệu ứng dụng."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Đặt lại ứng dụng"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Quản lý dung lượng"</string>
     <string name="filter" msgid="2018011724373033887">"Bộ lọc"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Để chuyển, nhấn Control-Phím cách"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Mặc định"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Bố cục bàn phím"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Từ điển người dùng"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Từ điển cá nhân"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Từ điển cá nhân"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Từ điển cá nhân"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Thêm"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Thêm vào từ điển"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Bao gồm tùy chọn trong trình đơn nguồn để thêm báo cáo lỗi"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Không khóa màn hình"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Màn hình sẽ không bao giờ chuyển sang chế độ nghỉ khi sạc"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bật nhật ký theo dõi HCI Bluetooth"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Giữ tất cả các gói HCI bluetooth trong một tệp"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Chọn thời gian chạy"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Chọn thời gian chạy"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Khởi động lại để thay đổi thời gian chạy từ <xliff:g id="OLD">%1$s</xliff:g> sang <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Cho phép vị trí mô phỏng"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Cho phép vị trí mô phỏng"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Cho phép gỡ lỗi USB?"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Bảo vệ bộ lưu trữ USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Các ứng dụng phải yêu cầu quyền đọc bộ lưu trữ USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Bảo vệ bộ lưu trữ USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Khi bộ lưu trữ USB được bảo vệ, các ứng dụng phải yêu cầu quyền đọc dữ liệu từ bộ nhớ ngoài."\n\n"Một số ứng dụng có thể không hoạt động cho đến khi được nhà phát triển cập nhật."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Khi bộ lưu trữ USB được bảo vệ, các ứng dụng phải yêu cầu quyền đọc dữ liệu từ bộ nhớ ngoài.\n\nMột số ứng dụng có thể không hoạt động cho đến khi được nhà phát triển cập nhật."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Bảo vệ thẻ SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Các ứng dụng phải yêu cầu quyền đọc thẻ SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Bảo vệ thẻ SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Khi thẻ SD được bảo vệ, các ứng dụng phải yêu cầu quyền đọc dữ liệu từ bộ nhớ ngoài."\n\n"Một số ứng dụng có thể không hoạt động cho đến khi được nhà phát triển cập nhật."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Khi thẻ SD được bảo vệ, các ứng dụng phải yêu cầu quyền đọc dữ liệu từ bộ nhớ ngoài.\n\nMột số ứng dụng có thể không hoạt động cho đến khi được nhà phát triển cập nhật."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Dòng lệnh cục bộ"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Bật ứng dụng dòng lệnh cung cấp quyền truy cập vỏ cục bộ"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Chọn tiện ích"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Chọn tiện ích"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Tạo tiện ích và cho phép truy cập?"</string>
@@ -1340,11 +1346,11 @@
     <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_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_screen_magnification_summary" msgid="2380627654189671754">"Khi tính năng này được bật, bạn có thể phóng to và thu nhỏ bằng cách chạm ba lần vào màn hình.\n\nTrong khi phóng to, bạn có thể:\n"<ul><li>"Xoay: Kéo hai hoặc nhiều ngón tay qua màn hình."</li>\n<li>"Điều chỉnh mức thu phóng: Chụm hai hoặc nhiều ngón tay với nhau hoặc tách chúng ra."</li></ul>\n\n"Bạn cũng có thể tạm thời thu phóng các mục bên dưới ngón tay bạn bằng cách nhấn ba lần và giữ. Ở trạng thái thu phóng này, bạn có thể kéo ngón tay để khám phá các phần khác nhau của màn hình. Thả ngón tay để trở về trạng thái trước.\n\nLưu ý: Nhấn ba lần để thu phóng toàn bộ trừ bàn phím và thanh điều hướng."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Phím tắt trợ năng"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Bật"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Tắt"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Khi tính năng này được bật, bạn có thể nhanh chóng bật các tính năng trợ năng trong hai bước:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Khi tính năng này được bật, bạn có thể nhanh chóng bật các tính năng trợ năng trong hai bước:\n\nBước 1: Bấm và giữ nút nguồn cho đến khi bạn nghe thấy một âm thanh hoặc cảm thấy rung.\n\nBước 2: Chạm và giữ hai ngón tay cho đến khi bạn nghe thấy xác nhận bằng âm thanh.\n\nNếu thiết bị có nhiều người dùng, việc sử dụng lối tắt này trên màn hình khóa tạm thời bật trợ năng cho đến khi thiết bị được mở khóa."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Chữ lớn"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Thu phóng màn hình"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Tự động cập nhật thu phóng màn hình"</string>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack cung cấp phản hồi bằng giọng nói nhằm giúp người dùng bị mù và mắt kém. Bạn có muốn cài đặt ứng dụng này miễn phí từ Android Market không?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Không có mô tả nào được cung cấp."</string>
     <string name="settings_button" msgid="3006713718908152930">"Cài đặt"</string>
+    <string name="print_settings" msgid="4742428530112487843">"In"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Cài đặt in"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Dịch vụ"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Sử dụng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> có thể nhận tài liệu mà bạn in. Những tài liệu như vậy có thể chứa dữ liệu nhạy cảm."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Chưa có dịch vụ nào được cài đặt"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Cài đặt"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Thêm máy in"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Bật"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Tắt"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Pin"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Cái gì đang sử dụng pin"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Không có dữ liệu sử dụng pin."</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Đang chạy Wi-Fi"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Máy tính bảng"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Điện thoại"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Dữ liệu đã gửi"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Dữ liệu đã nhận được"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Đã gửi dữ liệu di động"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Đã nhận dữ liệu di động"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Đã gửi dữ liệu Wi‑Fi"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Đã nhận dữ liệu Wi‑Fi"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Âm thanh"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Thời gian bật"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Độ cao"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Ảnh hưởng đến âm của văn bản nói"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Ngôn ngữ"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Không thể chọn ngôn ngữ"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Đặt giọng nói ngôn ngữ cụ thể cho văn bản nói"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Nghe ví dụ"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Phát minh hoạ ngắn về tổng hợp tiếng nói"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP không được hỗ trợ."</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Bạn không thể định cấu hình kết nối EAP Wi‑Fi trong khi thiết lập. Sau khi thiết lập, bạn có thể thực hiện điều đó trong Cài đặt &gt; Không dây và mạng."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Kết nối có thể mất vài phút..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Chạm "<b>"Tiếp theo"</b>" để tiếp tục thiết lập."\n\n"Chạm "<b>"Quay lại"</b>" để kết nối với mạng Wi‑Fi khác."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Chạm "<b>"Tiếp theo"</b>" để tiếp tục thiết lập.\n\nChạm "<b>"Quay lại"</b>" để kết nối với mạng Wi‑Fi khác."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Đồng bộ hóa đã được bật"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Đồng bộ hóa đã bị tắt"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Lỗi đồng bộ hóa"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Hiển thị mức vẽ quá GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Vô hiệu hóa các lớp phủ HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Luôn sử dụng GPU để tổng hợp màn hình"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Bật theo dõi OpenGL"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Tắt dữ liệu nền trên mạng di động. Sử dụng mạng không di động nếu cần."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Để giới hạn dữ liệu nền cho ứng dụng này, trước tiên hãy đặt giới hạn dữ liệu di động."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Giới hạn dữ liệu nền?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Tính năng này có thể khiến ứng dụng phụ thuộc vào dữ liệu nền ngừng hoạt động chỉ khi có mạng di động."\n\n"Bạn có thể tìm thấy biện pháp kiểm soát mức sử dụng dữ liệu thích hợp khác trong các cài đặt có trong ứng dụng."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Tính năng này có thể khiến ứng dụng phụ thuộc vào dữ liệu nền ngừng hoạt động chỉ khi có mạng di động.\n\nBạn có thể tìm thấy biện pháp kiểm soát mức sử dụng dữ liệu thích hợp khác trong các cài đặt có trong ứng dụng."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Chỉ có thể giới hạn dữ liệu nền khi bạn đặt giới hạn dữ liệu di động."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Bật tính năng tự động đồng bộ hóa dữ liệu?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Mọi thay đổi bạn thực hiện cho các tài khoản của bạn trên web sẽ tự động được sao chép sang máy tính bảng của bạn."\n\n"Một số tài khoản cũng có thể tự động sao chép mọi thay đổi bạn thực hiện trên máy tính bảng lên web. Tài khoản Google hoạt động theo cách này."\n\n"Để chọn loại thông tin sẽ đồng bộ hóa với từng tài khoản, truy cập Cài đặt và tài khoản."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Mọi thay đổi bạn thực hiện cho các tài khoản của bạn trên web sẽ được tự động sao chép sang điện thoại của bạn."\n\n"Một số tài khoản cũng có thể tự động đồng bộ hóa mọi thay đổi bạn thực hiện trên điện thoại với web. Tài khoản Google hoạt động theo cách này."\n\n"Để chọn loại thông tin sẽ đồng bộ hóa trong từng tài khoản, truy cập Cài đặt và tài khoản."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Mọi thay đổi bạn thực hiện cho các tài khoản của bạn trên web sẽ tự động được sao chép sang máy tính bảng của bạn.\n\nMột số tài khoản cũng có thể tự động sao chép mọi thay đổi bạn thực hiện trên máy tính bảng lên web. Tài khoản Google hoạt động theo cách này.\n\nĐể chọn loại thông tin sẽ đồng bộ hóa với từng tài khoản, truy cập Cài đặt và tài khoản."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Mọi thay đổi bạn thực hiện cho các tài khoản của bạn trên web sẽ được tự động sao chép sang điện thoại của bạn.\n\nMột số tài khoản cũng có thể tự động đồng bộ hóa mọi thay đổi bạn thực hiện trên điện thoại với web. Tài khoản Google hoạt động theo cách này.\n\nĐể chọn loại thông tin sẽ đồng bộ hóa trong từng tài khoản, truy cập Cài đặt và tài khoản."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Tắt tính năng tự động đồng bộ hóa dữ liệu?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Việc này sẽ bảo toàn mức sử dụng dữ liệu và pin, tuy nhiên bạn sẽ cần phải đồng bộ hóa từng tài khoản theo cách thủ công để thu thập thông tin gần đây. Và bạn sẽ không nhận được thông báo khi có cập nhật."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Ngày đặt lại chu kỳ sử dụng"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Thiết lập cảnh báo sử dụng dữ liệu"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Thiết lập giới hạn sử dụng dữ liệu"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Giới hạn sử dụng dữ liệu"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Kết nối dữ liệu di động của bạn sẽ bị vô hiệu hóa khi đạt đến giới hạn được chỉ định."\n\n"Vì việc sử dụng dữ liệu được máy tính bảng của bạn tính và nhà cung cấp dịch vụ của bạn có thể tính mức sử dụng khác nhau, hãy xem xét việc sử dụng giới hạn vừa phải."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Kết nối dữ liệu di động của bạn sẽ bị vô hiệu hóa khi đạt đến giới hạn được chỉ định."\n\n"Vì việc sử dụng dữ liệu được điện thoại của bạn tính và nhà cung cấp dịch vụ của bạn có thể tính mức sử dụng khác nhau, hãy xem xét việc sử dụng giới hạn vừa phải."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Kết nối dữ liệu di động của bạn sẽ bị vô hiệu hóa khi đạt đến giới hạn được chỉ định.\n\nVì việc sử dụng dữ liệu được máy tính bảng của bạn tính và nhà cung cấp dịch vụ của bạn có thể tính mức sử dụng khác nhau, hãy xem xét việc sử dụng giới hạn vừa phải."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Kết nối dữ liệu di động của bạn sẽ bị vô hiệu hóa khi đạt đến giới hạn được chỉ định.\n\nVì việc sử dụng dữ liệu được điện thoại của bạn tính và nhà cung cấp dịch vụ của bạn có thể tính mức sử dụng khác nhau, hãy xem xét việc sử dụng giới hạn vừa phải."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Giới hạn dữ liệu nền?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Nếu bạn hạn chế dữ liệu nền trên thiết bị di động, một số ứng dụng và dịch vụ sẽ không hoạt động trừ khi bạn kết nối với mạng Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Nếu bạn hạn chế dữ liệu nền trên thiết bị di động, một số ứng dụng và dịch vụ sẽ không hoạt động trừ khi bạn kết nối với mạng Wi-Fi."\n\n"Cài đặt này ảnh hưởng đến tất cả người dùng trên máy tính bảng này."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Nếu bạn hạn chế dữ liệu nền trên thiết bị di động, một số ứng dụng và dịch vụ sẽ không hoạt động trừ khi bạn kết nối với mạng Wi-Fi."\n\n"Cài đặt này ảnh hưởng đến tất cả người dùng trên điện thoại này."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Nếu bạn hạn chế dữ liệu nền trên thiết bị di động, một số ứng dụng và dịch vụ sẽ không hoạt động trừ khi bạn kết nối với mạng Wi-Fi.\n\nCài đặt này ảnh hưởng đến tất cả người dùng trên máy tính bảng này."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Nếu bạn hạn chế dữ liệu nền trên thiết bị di động, một số ứng dụng và dịch vụ sẽ không hoạt động trừ khi bạn kết nối với mạng Wi-Fi.\n\nCài đặt này ảnh hưởng đến tất cả người dùng trên điện thoại này."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"cảnh báo"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"giới hạn"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Ứng dụng đã xóa"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Người dùng"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Tiểu sử bị hạn chế"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Thêm người dùng mới"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Bạn có thể chia sẻ thiết bị này với những người khác bằng cách tạo thêm người dùng. Mỗi người dùng có không gian riêng mà họ có thể tùy chỉnh với các ứng dụng, hình nền riêng, v.v. Người dùng cũng có thể điều chỉnh các cài đặt máy tính bảng ảnh hưởng tới mọi người, chẳng hạn như Wi-Fi."\n\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_add_user_message_long" msgid="3086244205384741788">"Bạn có thể chia sẻ thiết bị này với những người khác bằng cách tạo thêm người dùng. Mỗi người dùng có không gian riêng mà họ có thể tùy chỉnh với các ứng dụng, hình nền riêng, v.v. Người dùng cũng có thể điều chỉnh các cài đặt máy tính bảng ảnh hưởng tới mọi người, chẳng hạn như Wi-Fi.\n\nSau khi bạn tạo người dùng mới, người đó cần thực hiện quy trình thiết lập.\n\nBất kỳ người dùng nào cũng có thể chấp nhận các quyền của ứng dụng được cập nhật thay mặt tất cả những người dùng khác."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Sau khi bạn tạo người dùng mới, người đó cần thực hiện quy trình thiết lập.\n\nBất kỳ người dùng nào cũng có thể chấp nhận các quyền của ứng dụng được cập nhật thay mặt tất cả những người dùng khác."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Thiết lập người dùng ngay bây giờ?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Đảm bảo có người để nhận máy tính bảng và thiết lập bộ nhớ của họ"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Thiết lập tiểu sử ngay bây giờ?"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Cài đặt này ảnh hưởng đến tất cả người dùng trên điện thoại này."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Thay đổi ngôn ngữ"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Thay đổi cỡ chữ"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Hạn chế"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Xóa các hạn chế"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Thay đổi PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Hiển thị thông báo"</string>
     <string name="help_label" msgid="1107174367904110532">"Trợ giúp"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Tài khoản dành cho nội dung"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 723b979e219..6592f618a36 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"位置"</item>
     <item msgid="255608127647030286">"个人"</item>
     <item msgid="4588829735729884491">"短信"</item>
-    <item msgid="8971765125227378270">"设备"</item>
+    <item msgid="886742181977884584">"媒体"</item>
+    <item msgid="7924928667052300589">"设备"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"粗略位置"</item>
@@ -246,7 +247,7 @@
     <item msgid="6546959730920410907">"修改通话记录"</item>
     <item msgid="446877710771379667">"读取日历"</item>
     <item msgid="7674458294386319722">"修改日历"</item>
-    <item msgid="8281201165558093009">"Wi-Fi 扫描"</item>
+    <item msgid="8281201165558093009">"WLAN 扫描"</item>
     <item msgid="8694611243479480497">"通知"</item>
     <item msgid="7776439107987345446">"手机网络扫描"</item>
     <item msgid="514615766544675057">"拨打电话"</item>
@@ -261,12 +262,23 @@
     <item msgid="587124103118495063">"写入 ICC 短信"</item>
     <item msgid="2320577158869025503">"修改设置"</item>
     <item msgid="1545733463471924009">"在顶部绘制"</item>
-    <item msgid="3609046903962454582">"查看通知"</item>
+    <item msgid="3609046903962454582">"访问通知"</item>
     <item msgid="4671646036128214513">"相机"</item>
     <item msgid="1097324338692486211">"录制音频"</item>
     <item msgid="5031552983987798163">"播放音频"</item>
     <item msgid="8374996688066472414">"读取剪贴板内容"</item>
     <item msgid="3045529469061083747">"修改剪贴板内容"</item>
+    <item msgid="5124443975763747838">"媒体按钮"</item>
+    <item msgid="4547883971364273343">"音频焦点"</item>
+    <item msgid="2603878814882344450">"主音量"</item>
+    <item msgid="7136963238377062018">"语音音量"</item>
+    <item msgid="4270236897655923007">"铃声音量"</item>
+    <item msgid="6325739889222559394">"媒体音量"</item>
+    <item msgid="5762123934816216821">"闹钟音量"</item>
+    <item msgid="785049718065337473">"通知音量"</item>
+    <item msgid="6700305533746877052">"蓝牙音量"</item>
+    <item msgid="2029227495214047094">"保持唤醒状态"</item>
+    <item msgid="26109888160231211">"监测位置"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"位置"</item>
@@ -294,18 +306,39 @@
     <item msgid="1188256962149204607">"发送短信/彩信"</item>
     <item msgid="4218544235221631789">"修改设置"</item>
     <item msgid="736541391767350377">"在顶部绘制"</item>
-    <item msgid="5530815681721654194">"查看通知"</item>
+    <item msgid="5530815681721654194">"访问通知"</item>
     <item msgid="781213371706962767">"相机"</item>
     <item msgid="1720492593061838172">"录制音频"</item>
     <item msgid="3493046322001257041">"播放音频"</item>
     <item msgid="136815868796597058">"读取剪贴板内容"</item>
     <item msgid="5238692940326972503">"修改剪贴板内容"</item>
+    <item msgid="5753789168376302997">"媒体按钮"</item>
+    <item msgid="3265262911688671938">"音频焦点"</item>
+    <item msgid="2098976479485046797">"主音量"</item>
+    <item msgid="5660213838861789350">"语音音量"</item>
+    <item msgid="7983336752371254444">"铃声音量"</item>
+    <item msgid="7878027809189330917">"媒体音量"</item>
+    <item msgid="7260546305036218513">"闹钟音量"</item>
+    <item msgid="9103719301075748925">"通知音量"</item>
+    <item msgid="7025966722295861512">"蓝牙音量"</item>
+    <item msgid="4665183401128289653">"保持唤醒状态"</item>
+    <item msgid="8584357129746649222">"位置"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
     <item msgid="2560532955514699713">"中"</item>
     <item msgid="2372711992605524591">"长"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART（调试）"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"使用 Dalvik"</item>
+    <item msgid="5131846588686178907">"使用 ART"</item>
+    <item msgid="4530003713865319928">"使用 ART 调试版本"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"永不检查"</item>
     <item msgid="6042769699089883931">"仅检查 DRM 内容"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"在屏幕上显示为线型图"</item>
     <item msgid="120512413928262547">"在 adb shell dumpsys gfxinfo 中"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"关闭"</item>
+    <item msgid="7688197031296835369">"显示过度绘制区域"</item>
+    <item msgid="8332661909019981149">"显示过度绘制计数器"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"标准限制"</item>
     <item msgid="4071574792028999443">"不允许后台进程"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 19ec2a67173..798052d011b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -275,8 +275,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_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>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"您每次开机时都需要输入数字 PIN 或密码才能解密平板电脑"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"您每次开机时都需要输入数字 PIN 或密码才能解密手机"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"已加密"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"您可以加密自己的帐户、设置、已下载的应用及其数据、媒体和其他文件。加密平板电脑后，您每次开机时都需要输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，但这会清除平板电脑上的所有数据。"\n\n"加密过程需要 1 小时或更长时间。在开始加密前，电池必须有电，并且在加密完成前必须一直连接电源。如果您中断加密过程，则会丢失部分或全部数据。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"您可以加密自己的帐户、设置、已下载的应用及其数据、媒体和其他文件。加密手机后，您每次开机时都需要输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，但这会清除手机上的所有数据。"\n\n"加密过程需要 1 小时或更长时间。在开始加密前，电池必须有电，并且在加密完成前必须一直连接电源。如果您中断加密过程，则会丢失部分或全部数据。"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"您可以加密自己的帐户、设置、已下载的应用及其数据、媒体和其他文件。加密平板电脑后，您每次开机时都需要输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，但这会清除平板电脑上的所有数据。\n\n加密过程需要 1 小时或更长时间。在开始加密前，电池必须有电，并且在加密完成前必须一直连接电源。如果您中断加密过程，则会丢失部分或全部数据。"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"您可以加密自己的帐户、设置、已下载的应用及其数据、媒体和其他文件。加密手机后，您每次开机时都需要输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，但这会清除手机上的所有数据。\n\n加密过程需要 1 小时或更长时间。在开始加密前，电池必须有电，并且在加密完成前必须一直连接电源。如果您中断加密过程，则会丢失部分或全部数据。"</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"加密平板电脑"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"加密手机"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"请为电池充电，然后重试。"</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> 秒后重试。"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"键入密码"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"加密失败"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"加密过程中断，无法完成。因此，您已无法再使用平板电脑上的数据。"\n\n"要继续使用您的平板电脑，您需要恢复出厂设置。恢复出厂设置后对平板电脑进行设置时，您可以将之前备份到 Google 帐户的所有数据恢复到平板电脑中。"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"加密过程中断，无法完成。因此，您已无法再使用手机上的数据。"\n\n"要继续使用您的手机，您需要恢复出厂设置。恢复出厂设置后对手机进行设置时，您可以将之前备份到 Google 帐户的所有数据恢复到手机中。"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"加密过程中断，无法完成。因此，您已无法再使用平板电脑上的数据。\n\n要继续使用您的平板电脑，您需要恢复出厂设置。恢复出厂设置后对平板电脑进行设置时，您可以将之前备份到 Google 帐户的所有数据恢复到平板电脑中。"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"加密过程中断，无法完成。因此，您已无法再使用手机上的数据。\n\n要继续使用您的手机，您需要恢复出厂设置。恢复出厂设置后对手机进行设置时，您可以将之前备份到 Google 帐户的所有数据恢复到手机中。"</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"切换输入法"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"选择屏幕锁定方式"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"选择备份锁"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"正在连接"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"已连接"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"可用"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"正在使用中"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"显示设备设置"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"是否断开连接？"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"此操作将会断开您与以下设备的连接：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,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="8850161330437693895">"WLAN"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"通过 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 进行保护"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"，通过 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 进行保护"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"无"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"为了提高位置信息精确度以及其他目的，“<xliff:g id="APP_NAME">%1$s</xliff:g>”请求启用网络扫描功能（在关闭了 WLAN  时也可进行扫描）。"\n\n"是否对所有需要进行扫描的应用批准这项请求？"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"为了提高位置信息精确度以及其他目的，“<xliff:g id="APP_NAME">%1$s</xliff:g>”请求启用网络扫描功能（在关闭了 WLAN  时也可进行扫描）。\n\n是否对所有需要进行扫描的应用批准这项请求？"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允许"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"拒绝"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"连接"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"警告：您可能需要额外支付运营商数据费。\n\n平板电脑设置过程可能会消耗大量网络流量。"</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"警告：您可能需要额外支付运营商数据费。\n\n手机设置过程可能会消耗大量网络流量。"</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"警告：您必须连接到互联网，平板电脑才能验证您所使用的软件是否为最新版本。"</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"警告：您必须连接到互联网，手机才能验证您所使用的软件是否为最新版本。"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"平板电脑无法连接到此 WLAN 网络。"</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM 卡 PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN 不正确"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN 不匹配"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"无法更改 PIN。"\n"PIN 可能不正确。"</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"无法更改 PIN。\nPIN 可能不正确。"</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"已成功更改 SIM 卡 PIN"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"无法更改 SIM 卡锁定状态。"\n"PIN 可能不正确。"</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"无法更改 SIM 卡锁定状态。\nPIN 可能不正确。"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"确定"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"取消"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"平板电脑状态"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"恢复出厂设置"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"清除平板电脑上的所有数据"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"清除手机上的所有数据"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"此操作会清除您平板电脑"<b>"内存设备"</b>"中的所有数据，包括："\n\n<li>"您的 Google 帐户"</li>\n<li>"系统及应用数据和设置"</li>\n<li>"已下载的应用"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"此操作会清除您手机"<b>"内存设备"</b>"中的所有数据，包括："\n\n<li>"您的 Google 帐户"</li>\n<li>"系统及应用数据和设置"</li>\n<li>"已下载的应用"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"目前，您已登录以下帐户："\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"此操作会清除您平板电脑"<b>"内存设备"</b>"中的所有数据，包括：\n\n"<li>"您的 Google 帐户"</li>\n<li>"系统及应用数据和设置"</li>\n<li>"已下载的应用"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"此操作会清除您手机"<b>"内存设备"</b>"中的所有数据，包括：\n\n"<li>"您的 Google 帐户"</li>\n<li>"系统及应用数据和设置"</li>\n<li>"已下载的应用"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"目前，您已登录以下帐户：\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音乐"</li>\n<li>"照片"</li>\n<li>"其他的用户数据"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"要清除音乐、照片和其他用户数据，请清空该 "<b>"USB 存储设备"</b>"。"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"要清除音乐、图片和其他用户数据，您需要清空该 "<b>"SD 卡"</b>"。"</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"显示缓存进程"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"重置应用偏好设置"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"要重置应用偏好设置吗？"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"此操作将会重置以下全部偏好设置："\n\n<li>"停用的应用"</li>\n<li>"停用的应用通知"</li>\n<li>"执行操作的默认应用"</li>\n<li>"应用的后台数据限制"</li>\n\n"您将不会丢失任何应用数据。"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"此操作将会重置以下全部偏好设置：\n\n"<li>"停用的应用"</li>\n<li>"停用的应用通知"</li>\n<li>"执行操作的默认应用"</li>\n<li>"应用的后台数据限制"</li>\n\n"您将不会丢失任何应用数据。"</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"重置应用"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"管理空间"</string>
     <string name="filter" msgid="2018011724373033887">"过滤"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"要切换，请按 Ctrl+空格键"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"默认"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"键盘布局"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"用户词典"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"个人词典"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"个人词典"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"个人词典"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"添加"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"添加到词典"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"在电源键菜单中添加提交错误报告的选项"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"不锁定屏幕"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充电时屏幕不会休眠"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"启用蓝牙 HCI 信息收集日志"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"捕获单个文件中的所有蓝牙 HCI 包"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"选择运行环境"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"选择运行环境"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"要重新启动以将运行环境从“<xliff:g id="OLD">%1$s</xliff:g>”改为“<xliff:g id="NEW">%2$s</xliff:g>”吗？"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"允许模拟位置"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"允许模拟位置"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"是否允许 USB 调试？"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"对 USB 存储设备进行读写保护"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"应用必须申请读取 USB 存储设备的权限"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"要对 USB 存储设备进行读写保护吗？"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"如果 USB 存储设备受到读写保护，则应用必须申请相关权限才能读取外部存储设备中的数据。"\n\n"某些应用需要其开发者更新之后才能正常使用。"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"如果 USB 存储设备受到读写保护，则应用必须申请相关权限才能读取外部存储设备中的数据。\n\n某些应用需要其开发者更新之后才能正常使用。"</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"对 SD 卡进行读写保护"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"应用必须申请读取 SD 卡的权限"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"要对 SD 卡进行读写保护吗？"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"如果 SD 卡受到读写保护，则应用必须申请相关权限才能读取外部存储设备中的数据。"\n\n"某些应用需要其开发者更新之后才能正常使用。"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"如果 SD 卡受到读写保护，则应用必须申请相关权限才能读取外部存储设备中的数据。\n\n某些应用需要其开发者更新之后才能正常使用。"</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"本地终端"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"启用终端应用，以便在本地访问 Shell"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"选择小工具"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"选择小部件"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"是否允许该应用创建并访问小部件？"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"服务"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"系统"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"放大手势"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"启用此功能后，您可以通过点按屏幕三次进行缩放。"\n\n"放大时，您可以："\n<ul><li>"平移：在屏幕上拖动两根或更多根手指。"</li>\n<li>"调整缩放级别：开合两根或更多根手指。"</li></ul>\n\n"同时，您还可以通过点按三次并按住的方法来暂时性地放大手指触摸到的内容。在此放大状态下，您可以拖动手指查看屏幕上的各个部分。松开手指即可返回之前的状态。"\n\n"请注意：点按屏幕三次进行放大的方法适用于除键盘和导航栏外的所有情况。"</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_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>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"“话语提示”可提供语音反馈以帮助盲人和有视力障碍的用户。您要通过 Play 商店免费安装该服务吗？"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"没有提供说明。"</string>
     <string name="settings_button" msgid="3006713718908152930">"设置"</string>
+    <string name="print_settings" msgid="4742428530112487843">"打印"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"打印设置"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"服务"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"要使用<xliff:g id="SERVICE">%1$s</xliff:g>吗？"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>可以接收您打印的文档。此类文档可能包含敏感数据。"</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"未安装任何服务"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"设置"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"添加打印机"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"打开"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"关闭"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"电池"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"耗电情况"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"无法获取电池使用数据。"</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"WLAN 正在运行"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"平板电脑"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"通话"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"数据已发送"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"数据已收到"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"发送的移动数据量"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"接收的移动数据量"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"发送的 WLAN 数据量"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"接收的 WLAN 数据量"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"音频"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"视频"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"已运行时间"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"音高"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"更改所播放的文字的音调"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"语言"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"未选择语言"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"设置文字转语音功能要使用的语言"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"收听示例"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"播放简短的语音合成示例"</string>
@@ -1594,7 +1613,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"不支持 EAP。"</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"您无法在设置过程中配置 EAP WLAN 连接。设置完毕后，您可以在“设置”&gt;“无线和网络”中进行配置。"</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"建立连接可能需要几分钟时间..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"触摸"<b>"下一步"</b>"可继续进行设置。"\n\n"触摸"<b>"返回"</b>"可连接到其他 WLAN 网络。"</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"触摸"<b>"下一步"</b>"可继续进行设置。\n\n触摸"<b>"返回"</b>"可连接到其他 WLAN 网络。"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"同步功能已启用"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"同步功能已停用"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"同步错误。"</string>
@@ -1622,7 +1641,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"日历"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"联系人"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"欢迎使用 Google Sync！"</font>" "\n"这款数据同步工具可让您随时随地查看您的联系人、约会以及更多信息。"</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"欢迎使用 Google Sync！"</font>" \n这款数据同步工具可让您随时随地查看您的联系人、约会以及更多信息。"</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"应用同步设置"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"数据与同步"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"更改密码"</string>
@@ -1676,8 +1695,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"调试 GPU 过度绘制"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"停用 HW 叠加层"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"始终使用 GPU 进行屏幕合成"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"启用 OpenGL 跟踪"</string>
@@ -1738,11 +1756,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"使用移动网络时停用后台数据。系统会尽量使用非移动网络。"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"要限制此应用使用后台数据，请先设置移动数据上限。"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"限制后台数据？"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"只能连接到移动网络时，此功能可能会导致需要使用后台数据的应用停止运行。"\n\n"您可以在相关应用的设置中查找更合适的数据流量控制选项。"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"只能连接到移动网络时，此功能可能会导致需要使用后台数据的应用停止运行。\n\n您可以在相关应用的设置中查找更合适的数据流量控制选项。"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"您只有在设置移动数据上限后才能限制后台数据。"</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"要打开自动同步数据功能吗？"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"您在网络上对您的帐户进行的所有更改都会自动同步到您的平板电脑。"\n\n"有些帐户还可以将您在平板电脑上进行的所有更改自动同步到网络上。这就是 Google 帐户的精彩之处。"\n\n"要选择每个帐户中要同步哪些类型的信息，请转到“设置 &gt; 帐户”。"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"您在网络上对您的帐户进行的所有更改都会自动同步到您的手机。"\n\n"有些帐户还可以将您在手机上进行的所有更改自动同步到网络上。这就是 Google 帐户的精彩之处。"\n\n"要选择每个帐户中要同步哪些类型的信息，请转到“设置 &gt; 帐户”。"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"您在网络上对您的帐户进行的所有更改都会自动同步到您的平板电脑。\n\n有些帐户还可以将您在平板电脑上进行的所有更改自动同步到网络上。这就是 Google 帐户的精彩之处。\n\n要选择每个帐户中要同步哪些类型的信息，请转到“设置 &gt; 帐户”。"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"您在网络上对您的帐户进行的所有更改都会自动同步到您的手机。\n\n有些帐户还可以将您在手机上进行的所有更改自动同步到网络上。这就是 Google 帐户的精彩之处。\n\n要选择每个帐户中要同步哪些类型的信息，请转到“设置 &gt; 帐户”。"</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"要关闭自动同步数据功能吗？"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"这样可以节省数据流量和电池电量，但您需要手动同步每个帐户才能获得最新信息，并且在有更新时不会收到通知。"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"使用情况周期重置日期"</string>
@@ -1751,12 +1769,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"设置流量使用量警告"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"设置数据使用限制"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"正在限制数据使用量"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"达到指定的数据流量上限时，系统会停用您的移动数据连接。"\n\n"由于数据流量是由您的平板电脑计算得出的，您的运营商对于流量的计算方法可能有所不同，因此请考虑设置一个较低的上限。"</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"达到指定的数据流量上限时，系统会停用您的移动数据连接。"\n\n"由于数据流量是由您的手机计算得出的，您的运营商对于流量的计算方法可能有所不同，因此请考虑设置一个较低的上限。"</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"达到指定的数据流量上限时，系统会停用您的移动数据连接。\n\n由于数据流量是由您的平板电脑计算得出的，您的运营商对于流量的计算方法可能有所不同，因此请考虑设置一个较低的上限。"</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"达到指定的数据流量上限时，系统会停用您的移动数据连接。\n\n由于数据流量是由您的手机计算得出的，您的运营商对于流量的计算方法可能有所不同，因此请考虑设置一个较低的上限。"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"限制后台数据？"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"如果您限制在后台使用移动数据网络，则在未连接到 WLAN 网络时，部分应用和服务将会无法运行。"</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"如果您限制在后台使用移动数据网络，则在未连接到 WLAN 网络时，部分应用和服务将会无法运行。"\n\n"此设置会影响这台平板电脑上的所有用户。"</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"如果您限制在后台使用移动数据网络，则在未连接到 WLAN 网络时，部分应用和服务将会无法运行。"\n\n"此设置会影响这部手机上的所有用户。"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"如果您限制在后台使用移动数据网络，则在未连接到 WLAN 网络时，部分应用和服务将会无法运行。\n\n此设置会影响这台平板电脑上的所有用户。"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"如果您限制在后台使用移动数据网络，则在未连接到 WLAN 网络时，部分应用和服务将会无法运行。\n\n此设置会影响这部手机上的所有用户。"</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"警告"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"限制"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"已删除的应用"</string>
@@ -1843,8 +1861,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"用户"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"受限个人资料"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"添加新用户"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"您可以通过创建新用户来与其他人共享此设备。每个用户都会有自己的空间，其中可以容纳他们自己的应用、壁纸等内容。用户可以调整 WLAN 等会影响到所有用户的平板电脑设置。"\n\n"您创建新用户后，该用户必须完成设置流程。"\n\n"任何用户均可代表其他所有用户接受应用的新权限。"</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"您创建新用户后，该用户必须完成设置流程。"\n\n"任何用户均可代表其他所有用户接受应用的新权限。"</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"您可以通过创建新用户来与其他人共享此设备。每个用户都会有自己的空间，其中可以容纳他们自己的应用、壁纸等内容。用户可以调整 WLAN 等会影响到所有用户的平板电脑设置。\n\n您创建新用户后，该用户必须完成设置流程。\n\n任何用户均可代表其他所有用户接受应用的新权限。"</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"您创建新用户后，该用户必须完成设置流程。\n\n任何用户均可代表其他所有用户接受应用的新权限。"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"是否立即设置用户？"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"请让这个人拿过平板电脑，让其设置自己的空间。"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"要立即设置个人资料吗？"</string>
@@ -1875,6 +1893,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"此设置会影响这部手机上的所有用户。"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"更改语言"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"更改字体大小"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"限制"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"取消限制"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"更改 PIN 码"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"显示通知"</string>
     <string name="help_label" msgid="1107174367904110532">"帮助"</string>
     <string name="user_account_title" msgid="1127193807312271167">"内容帐户"</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index a7f70da527d..e03401290b8 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"位置"</item>
     <item msgid="255608127647030286">"個人"</item>
     <item msgid="4588829735729884491">"簡訊"</item>
-    <item msgid="8971765125227378270">"裝置"</item>
+    <item msgid="886742181977884584">"媒體"</item>
+    <item msgid="7924928667052300589">"裝置"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"約略位置"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"播放音訊"</item>
     <item msgid="8374996688066472414">"讀取剪貼簿"</item>
     <item msgid="3045529469061083747">"修改剪貼簿"</item>
+    <item msgid="5124443975763747838">"媒體按鈕"</item>
+    <item msgid="4547883971364273343">"音訊焦點"</item>
+    <item msgid="2603878814882344450">"主音量"</item>
+    <item msgid="7136963238377062018">"語音音量"</item>
+    <item msgid="4270236897655923007">"鈴聲音量"</item>
+    <item msgid="6325739889222559394">"媒體音量"</item>
+    <item msgid="5762123934816216821">"鬧鐘音量"</item>
+    <item msgid="785049718065337473">"通知音量"</item>
+    <item msgid="6700305533746877052">"藍牙音量"</item>
+    <item msgid="2029227495214047094">"停用休眠"</item>
+    <item msgid="26109888160231211">"監控位置"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"位置"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"播放音訊"</item>
     <item msgid="136815868796597058">"讀取剪貼簿"</item>
     <item msgid="5238692940326972503">"修改剪貼簿"</item>
+    <item msgid="5753789168376302997">"媒體按鈕"</item>
+    <item msgid="3265262911688671938">"音訊焦點"</item>
+    <item msgid="2098976479485046797">"主音量"</item>
+    <item msgid="5660213838861789350">"語音音量"</item>
+    <item msgid="7983336752371254444">"鈴聲音量"</item>
+    <item msgid="7878027809189330917">"媒體音量"</item>
+    <item msgid="7260546305036218513">"鬧鐘音量"</item>
+    <item msgid="9103719301075748925">"通知音量"</item>
+    <item msgid="7025966722295861512">"藍牙音量"</item>
+    <item msgid="4665183401128289653">"停用休眠"</item>
+    <item msgid="8584357129746649222">"定位"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
     <item msgid="2560532955514699713">"中"</item>
     <item msgid="2372711992605524591">"長"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"Dalvik"</item>
+    <item msgid="8978402910750533864">"ART"</item>
+    <item msgid="7839859333977894115">"ART (偵錯)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"使用 Dalvik"</item>
+    <item msgid="5131846588686178907">"使用 ART"</item>
+    <item msgid="4530003713865319928">"使用 ART 偵錯版本"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"不要檢查"</item>
     <item msgid="6042769699089883931">"僅檢查 DRM 內容"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"在螢幕上以行顯示"</item>
     <item msgid="120512413928262547">"在「In adb shell dumpsys gfxinfo」指令中"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"關閉"</item>
+    <item msgid="7688197031296835369">"顯示透支區域"</item>
+    <item msgid="8332661909019981149">"顯示透支計數器"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"標準限制"</item>
     <item msgid="4071574792028999443">"不執行背景處理程序"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 887bc6360b9..b8b31a79877 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -275,8 +275,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_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>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"每次平板電腦開機後，需輸入數字 PIN 或密碼才能對平板電腦解密。"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"每次手機開機後，需輸入數字 PIN 或密碼才能對手機解密。"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"已加密"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"您可以將帳戶、設定、已下載的應用程式及其資料、媒體和其他檔案加密。一旦您將平板電腦加密，就必須在每次開機時輸入數字 PIN 或密碼，如此才能解密。如要解除加密狀態，必須恢復原廠設定，但這樣會清除平板電腦上的所有資料。"\n\n"加密過程可能需要 1 個小時以上的時間。加密前必須先將電池充滿電，並且在過程中讓平板電腦持續連接電源，直到加密完成為止。如果加密過程中斷，您將失去部分或所有資料。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"您可以將帳戶、設定、已下載的應用程式及其資料、媒體和其他檔案加密。一旦您將手機加密，就必須在每次開機時輸入數字 PIN 或密碼，如此才能解密。如要解除加密狀態，必須恢復原廠設定，但這樣會清除手機上所有的資料。"\n\n"加密過程可能需要 1 個小時以上的時間。加密前必須先將電池充滿電，並且在過程中讓手機持續連接電源，直到加密完成為止。如果加密過程中斷，您將失去部分或所有資料。"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"您可以將帳戶、設定、已下載的應用程式及其資料、媒體和其他檔案加密。一旦您將平板電腦加密，就必須在每次開機時輸入數字 PIN 或密碼，如此才能解密。如要解除加密狀態，必須恢復原廠設定，但這樣會清除平板電腦上的所有資料。\n\n加密過程可能需要 1 個小時以上的時間。加密前必須先將電池充滿電，並且在過程中讓平板電腦持續連接電源，直到加密完成為止。如果加密過程中斷，您將失去部分或所有資料。"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"您可以將帳戶、設定、已下載的應用程式及其資料、媒體和其他檔案加密。一旦您將手機加密，就必須在每次開機時輸入數字 PIN 或密碼，如此才能解密。如要解除加密狀態，必須恢復原廠設定，但這樣會清除手機上所有的資料。\n\n加密過程可能需要 1 個小時以上的時間。加密前必須先將電池充滿電，並且在過程中讓手機持續連接電源，直到加密完成為止。如果加密過程中斷，您將失去部分或所有資料。"</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"加密保護平板電腦"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"對手機進行加密"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"將電池充電，然後再試一次。"</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> 秒內再試一次。"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"輸入密碼"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"加密失敗"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"加密過程中斷，無法完成，因此您再也不能存取平板電腦上的資料。"\n\n"如要恢復使用平板電腦，請先將平板電腦重設回原廠設定。完成重設後，您可以在設定平板電腦時，將先前備份至「Google 帳戶」的資料全部還原。"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"加密過程中斷，無法完成，因此您再也不能存取手機上的資料。"\n\n"如要恢復使用手機，請先將手機重設回原廠設定。完成重設後，您可以在設定手機時，將先前備份至「Google 帳戶」的資料全部還原。"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"加密過程中斷，無法完成，因此您再也不能存取平板電腦上的資料。\n\n如要恢復使用平板電腦，請先將平板電腦重設回原廠設定。完成重設後，您可以在設定平板電腦時，將先前備份至「Google 帳戶」的資料全部還原。"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"加密過程中斷，無法完成，因此您再也不能存取手機上的資料。\n\n如要恢復使用手機，請先將手機重設回原廠設定。完成重設後，您可以在設定手機時，將先前備份至「Google 帳戶」的資料全部還原。"</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"切換輸入法"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"選擇螢幕鎖定方式"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"選擇備用解鎖方式"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"連線中"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"已連線"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"可以使用"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"正在使用中"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"顯示裝置設定"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"中斷連線？"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"這個動作會結束您與下列裝置的連線：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,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="8850161330437693895">"Wi‑Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"透過 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 加密保護"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"，透過 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 加密保護"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"無"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> 要求開啟網路掃描功能 (即使 Wi-Fi 已關閉)，藉此提升定位精確度及用於其他用途。"\n\n"您要對所有需要執行掃描的應用程式允許這項要求嗎？"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> 要求開啟網路掃描功能 (即使 Wi-Fi 已關閉)，藉此提升定位精確度及用於其他用途。\n\n您要對所有需要執行掃描的應用程式允許這項要求嗎？"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允許"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"拒絕"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"連線"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"警告：您可能需支付額外的數據傳輸費用。\n\n平板電腦設定程序可能需要佔用大量網路流量。"</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"警告：您可能需支付額外的數據傳輸費用。\n\n手機設定程序可能需要佔用大量網路流量。"</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"警告：連上網際網路後，平板電腦才能驗證您所使用的軟體是否為最新版本。"</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"警告：連上網際網路後，手機才能驗證您所使用的軟體是否為最新版本。"</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"您的平板電腦無法連線至這個 Wi-Fi 網路。"</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"PIN 不正確"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"PIN 不符"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"無法變更 PIN。"\n"PIN 碼可能不正確。"</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"無法變更 PIN。\nPIN 碼可能不正確。"</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"成功變更 SIM PIN"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"無法變更 SIM 卡鎖定狀態。"\n"可能輸入了不正確的 PIN。"</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"無法變更 SIM 卡鎖定狀態。\n可能輸入了不正確的 PIN。"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"確定"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"取消"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"平板電腦狀態"</string>
@@ -918,9 +919,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"恢復原廠設定"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"清除平板電腦上的所有資料"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"清除手機上所有資料"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"這會清除您平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包括："\n\n<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"這會清除您手機"<b>"內部儲存裝置"</b>"中的所有資料，包括："\n\n<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"您目前已登入下列帳戶："\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"這會清除您平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"這會清除您手機"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"您目前已登入下列帳戶：\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音樂"</li>\n<li>"相片"</li>\n<li>"其他使用者資料"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"如要一併清除音樂、圖片及其他用戶資料，則需清除 "<b>"USB 儲存裝置"</b>"資料。"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"如要清除音樂、圖片及其他使用者資料，必須先清除 "<b>"SD 卡"</b>"。"</string>
@@ -1105,7 +1106,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"顯示快取處理程序"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"重設應用程式偏好設定"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"重設應用程式偏好設定？"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"這會將下列項目的所有偏好設定全部重設："\n\n" "<li>"已停用的應用程式"</li>\n" "<li>"已停用的應用程式通知"</li>\n" "<li>"執行動作的預設應用程式"</li>\n" "<li>"應用程式背景資料限制"</li>\n\n" 請放心，您的所有應用程式資料都不會遭到移除。"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"這會將下列項目的所有偏好設定全部重設：\n\n "<li>"已停用的應用程式"</li>\n" "<li>"已停用的應用程式通知"</li>\n" "<li>"執行動作的預設應用程式"</li>\n" "<li>"應用程式背景資料限制"</li>\n\n" 請放心，您的所有應用程式資料都不會遭到移除。"</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"重設應用程式"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"管理空間"</string>
     <string name="filter" msgid="2018011724373033887">"篩選"</string>
@@ -1240,9 +1241,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"如要切換，請按下 Ctrl+空白鍵。"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"預設"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"鍵盤配置"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"使用者字典"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"個人字典"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"個人字典"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"個人字典"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"新增"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"新增至字典"</string>
@@ -1303,6 +1302,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"在電源選單中納入取得錯誤報告的選項"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"保持清醒"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充電時螢幕不會進入休眠"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"啟用藍牙 HCI 窺探紀錄"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"擷取單一檔案內的所有藍牙 HCI 封包"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"選取執行階段"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"選取執行階段"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"要重新啟動裝置，將執行階段從 <xliff:g id="OLD">%1$s</xliff:g> 變更為 <xliff:g id="NEW">%2$s</xliff:g> 嗎？"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"允許模擬位置"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"允許模擬位置"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"允許 USB 偵錯嗎？"</string>
@@ -1315,11 +1319,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"保護 USB 儲存裝置"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"應用程式必須取得權限，才能讀取 USB 儲存裝置"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"保護 USB 儲存裝置？"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"USB 儲存裝置受到保護時，應用程式必須取得權限，才能從外部儲存裝置讀取資料。"\n\n"部分應用程式可能需由開發人員更新，才能正常運作。"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"USB 儲存裝置受到保護時，應用程式必須取得權限，才能從外部儲存裝置讀取資料。\n\n部分應用程式可能需由開發人員更新，才能正常運作。"</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"保護 SD 卡"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"應用程式必須取得權限，才能讀取 SD 卡"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"保護 SD 卡？"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SD 卡受到保護時，應用程式必須取得權限，才能從外部儲存裝置讀取資料。"\n\n"部分應用程式可能需由開發人員更新，才能正常運作。"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"SD 卡受到保護時，應用程式必須取得權限，才能從外部儲存裝置讀取資料。\n\n部分應用程式可能需由開發人員更新，才能正常運作。"</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"本機終端機"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"啟用可提供本機命令介面存取權的終端機應用程式"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"選擇小工具"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"選擇小工具"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"是否要建立小工具並允許存取？"</string>
@@ -1340,11 +1346,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"服務"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"系統"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"放大手勢"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"啟用這項功能時，只要在螢幕上輕按三下即可縮放。"\n\n"放大時，您可以："\n<ul><li>"平移：使用兩指或多指在螢幕上拖曳。"</li>\n<li>"調整縮放等級：使用兩指或多指往內撥或往外撥。"</li></ul>\n\n"此外，您只要輕按三下並持續按住，即可暫時放大手指所觸畫面。在這種放大狀態下，您可以使用手指拖曳，藉此探索畫面的不同部分。手指離開後，畫面隨即恢復原先的狀態。"\n\n"注意：除了鍵盤與導覽列部分以外，其他地方均適用輕按三下以放大畫面的做法。"</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_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>
@@ -1366,6 +1372,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack 提供語音回應功能協助視障或視力不佳的使用者。現在可以免費從 Android Market 安裝這項功能，您要安裝嗎？"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"未提供說明。"</string>
     <string name="settings_button" msgid="3006713718908152930">"設定"</string>
+    <string name="print_settings" msgid="4742428530112487843">"列印"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"列印設定"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"服務"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"要使用「<xliff:g id="SERVICE">%1$s</xliff:g>」嗎？"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"「<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g>」可接收您所列印的文件，這些文件可能含有機密資料。"</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"未安裝任何服務"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"設定"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"新增印表機"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"開啟"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"關閉"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"電池"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"查看正在消耗電力的功能"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"沒有電池用量資料。"</string>
@@ -1405,8 +1421,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi 執行中"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"平板電腦"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"手機"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"已傳送資料"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"已接收資料"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"已傳送的行動數據量"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"已接收的行動數據量"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"已傳送的 Wi-Fi 數據量"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"已接收的 Wi-Fi 數據量"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"音訊"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"影片"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"開啟時間"</string>
@@ -1460,6 +1478,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"音調"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"影響文字轉語音功能的播放音調"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"語言"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"未選取語言"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"設定文字轉語音功能要用的語言"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"聆聽範例"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"播放簡短的語音合成範例"</string>
@@ -1598,7 +1617,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP 不受支援。"</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"設定精靈執行期間無法調整 EAP Wi-Fi 連線設定。請在設定精靈完成後，前往 [設定] 的 [無線與網路] 調整相關設定。"</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"連線中，請稍候幾分鐘…"</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"輕觸 [下一步]"<b></b>" 即可繼續設定程序；"\n\n"輕觸 [返回]"<b></b>" 則可連線至其他 Wi-Fi 網路。"</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"輕觸 [下一步]"<b></b>" 即可繼續設定程序；\n\n輕觸 [返回]"<b></b>" 則可連線至其他 Wi-Fi 網路。"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"同步處理已啟用"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"同步處理已停用"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"同步處理錯誤。"</string>
@@ -1680,8 +1699,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"針對 GPU 透支情形進行偵錯"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"停用硬體重疊圖層"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"一律使用 GPU 進行畫面合成"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"啟用 OpenGL 追蹤"</string>
@@ -1742,11 +1760,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"停用行動網路的背景資料。系統將使用非行動網路 (可連上時)。"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"您必須設定行動數據限制，才能限制這個應用程式的背景資料。"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"限制背景資料？"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"如果採用這項功能，當只有行動網路可供使用時，需要背景數據傳輸的應用程式可能會停止運作。"\n\n"您可以在應用程式的設定選單中，找出更多適當的數據用量的選項。"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"如果採用這項功能，當只有行動網路可供使用時，需要背景數據傳輸的應用程式可能會停止運作。\n\n您可以在應用程式的設定選單中，找出更多適當的數據用量的選項。"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"您必須設定行動數據限制，才能限制背景資料。"</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"開啟資料自動同步功能？"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"您在網路上對帳戶進行的任何變更都會自動複製到您的平板電腦。"\n\n"部分帳戶也可能自動將您在平板電腦上進行的所有變更複製到網路上。Google 帳戶會按照這種方式運作。"\n\n"如要選擇每個帳戶要同步處理的資訊類型，請前往 [設定] &gt; [帳戶]。"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"您在網路上對帳戶進行的任何變更都會自動複製到您的手機。"\n\n"部分帳戶也可能自動將您在手機上進行的所有變更複製到網路上。Google 帳戶會按照這種方式運作。"\n\n"如要選擇每個帳戶要同步處理的資訊類型，請前往 [設定] &gt; [帳戶]。"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"您在網路上對帳戶進行的任何變更都會自動複製到您的平板電腦。\n\n部分帳戶也可能自動將您在平板電腦上進行的所有變更複製到網路上。Google 帳戶會按照這種方式運作。\n\n如要選擇每個帳戶要同步處理的資訊類型，請前往 [設定] &gt; [帳戶]。"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"您在網路上對帳戶進行的任何變更都會自動複製到您的手機。\n\n部分帳戶也可能自動將您在手機上進行的所有變更複製到網路上。Google 帳戶會按照這種方式運作。\n\n如要選擇每個帳戶要同步處理的資訊類型，請前往 [設定] &gt; [帳戶]。"</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"關閉資料自動同步功能？"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"這樣可以節省資料用量和電池用量，但您必須手動同步處理每個帳戶才能收集最新資訊。此外，系統進行更新時不會通知您。"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"用量週期重設日期"</string>
@@ -1755,12 +1773,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"設定數據用量警告"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"設定數據用量上限"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"限制資料用量"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"達到指定的流量上限時，系統會停用您的行動數據連線。"\n\n"由於資料用量需依您的平板電腦來計算，而您的行動通訊業者計費方式可能有所不同，請考慮採用保守估計的上限值。"</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"達到指定的流量上限時，系統會停用您的行動數據連線。"\n\n"由於資料用量需依您的手機來計算，而您的行動通訊業者計費方式可能有所不同，請考慮採用保守估計的上限值。"</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"達到指定的流量上限時，系統會停用您的行動數據連線。\n\n由於資料用量需依您的平板電腦來計算，而您的行動通訊業者計費方式可能有所不同，請考慮採用保守估計的上限值。"</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"達到指定的流量上限時，系統會停用您的行動數據連線。\n\n由於資料用量需依您的手機來計算，而您的行動通訊業者計費方式可能有所不同，請考慮採用保守估計的上限值。"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"限制背景資料？"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"若限制背景行動數據傳輸量，必須連線至 Wi-Fi 網路，部分應用程式和服務才能運作。"</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"若限制背景行動數據傳輸量，必須連線至 Wi-Fi 網路，部分應用程式和服務才能運作。"\n\n"這項設定會影響這台平板電腦的所有使用者。"</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"若限制背景行動數據傳輸量，必須連線至 Wi-Fi 網路，部分應用程式和服務才能運作。"\n\n"這項設定會影響這支手機的所有使用者。"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"若限制背景行動數據傳輸量，必須連線至 Wi-Fi 網路，部分應用程式和服務才能運作。\n\n這項設定會影響這台平板電腦的所有使用者。"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"若限制背景行動數據傳輸量，必須連線至 Wi-Fi 網路，部分應用程式和服務才能運作。\n\n這項設定會影響這支手機的所有使用者。"</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"警告"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"限制"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"移除的應用程式"</string>
@@ -1847,8 +1865,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"使用者"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"設有限制的個人資料"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"新增使用者"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"您可以建立更多使用者，與更多人共用此裝置。每位使用者都擁有個人空間，可使用並自訂個人的應用程式和桌布等等。此外，使用者可以調整平板電腦設定 (例如會影響所有人的 Wi-Fi 設定)。"\n\n"建立新的使用者之後，必須請新使用者完成設定程序。"\n\n"任何使用者都可以代表其他所有使用者接受更新的應用程式權限。"</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"您建立新的使用者之後，對方必須完成設定程序。"\n\n"任何使用者都可以代表所有其他使用者接受更新的應用程式權限。"</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"您可以建立更多使用者，與更多人共用此裝置。每位使用者都擁有個人空間，可使用並自訂個人的應用程式和桌布等等。此外，使用者可以調整平板電腦設定 (例如會影響所有人的 Wi-Fi 設定)。\n\n建立新的使用者之後，必須請新使用者完成設定程序。\n\n任何使用者都可以代表其他所有使用者接受更新的應用程式權限。"</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"您建立新的使用者之後，對方必須完成設定程序。\n\n任何使用者都可以代表所有其他使用者接受更新的應用程式權限。"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"立即設定使用者？"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"請確保對方可以使用平板電腦並設定自己的空間"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"立即建立個人資料？"</string>
@@ -1879,6 +1897,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"這項設定會影響這支手機的所有使用者。"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"變更語言"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"變更字型大小"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"限制"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"移除限制"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"變更 PIN 碼"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"顯示通知"</string>
     <string name="help_label" msgid="1107174367904110532">"說明"</string>
     <string name="user_account_title" msgid="1127193807312271167">"內容帳戶"</string>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 605e32d5f80..6be38649edb 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -30,8 +30,8 @@
     <item msgid="8392017019801393511">"Konke"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"amasekhondi angu-15"</item>
-    <item msgid="8881760709354815449">"amasekhondi angu-30"</item>
+    <item msgid="3342301044271143016">"15 amasekhondi"</item>
+    <item msgid="8881760709354815449">"30 amasekhondi"</item>
     <item msgid="7589406073232279088">"1 iminithi"</item>
     <item msgid="7001195990902244174">"2 amaminithi"</item>
     <item msgid="7489864775127957179">"amaminithii angu-5"</item>
@@ -50,9 +50,9 @@
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="8929270399652145290">"Ngokushesha"</item>
-    <item msgid="6736512735606834431">"amasekhondi angu-5"</item>
-    <item msgid="8044619388267891375">"amasekhondi angu-15"</item>
-    <item msgid="1822002388249545488">"amasekhondi angu-30"</item>
+    <item msgid="6736512735606834431">"5 amasekhondi"</item>
+    <item msgid="8044619388267891375">"15 amasekhondi"</item>
+    <item msgid="1822002388249545488">"30 amasekhondi"</item>
     <item msgid="8538071621211916519">"1 iminithi"</item>
     <item msgid="5663439580228932882">"2 amaminithi"</item>
     <item msgid="49888496216106852">"5 amaminithi"</item>
@@ -142,7 +142,7 @@
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="8151962652413645395">"2 amaminithi"</item>
     <item msgid="8675215713017289017">"amaminithii angu-5"</item>
-    <item msgid="477015974247590543">"ihora elingu-1"</item>
+    <item msgid="477015974247590543">"1 ihora"</item>
     <item msgid="5198271470953124739">"Ayiphelelwa isikhathi"</item>
   </string-array>
   <string-array name="wifi_signal">
@@ -233,7 +233,8 @@
     <item msgid="6358963769537892925">"Indawo"</item>
     <item msgid="255608127647030286">"Okomuntu siqu"</item>
     <item msgid="4588829735729884491">"Imilayezo"</item>
-    <item msgid="8971765125227378270">"Idivayisi"</item>
+    <item msgid="886742181977884584">"Abezindaba"</item>
+    <item msgid="7924928667052300589">"Idivayisi"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"indawo emaholoholo"</item>
@@ -267,6 +268,17 @@
     <item msgid="5031552983987798163">"dlala umsindo"</item>
     <item msgid="8374996688066472414">"funda ibhodi lokunamathisela"</item>
     <item msgid="3045529469061083747">"shintsha ibhodi lokunamathisela"</item>
+    <item msgid="5124443975763747838">"izinkinobho zabezindaba"</item>
+    <item msgid="4547883971364273343">"ukugxila komsindo"</item>
+    <item msgid="2603878814882344450">"ivolumu kangqo"</item>
+    <item msgid="7136963238377062018">"ivolumu yezwi"</item>
+    <item msgid="4270236897655923007">"ivolumu yokukhala"</item>
+    <item msgid="6325739889222559394">"ivolumu yabezindaba"</item>
+    <item msgid="5762123934816216821">"ivolumu ye-alamu"</item>
+    <item msgid="785049718065337473">"ivolumu yesaziso"</item>
+    <item msgid="6700305533746877052">"ivolumu ye-bluetooth"</item>
+    <item msgid="2029227495214047094">"gcina kuphapheme"</item>
+    <item msgid="26109888160231211">"ngamela indawo"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Indawo"</item>
@@ -300,12 +312,33 @@
     <item msgid="3493046322001257041">"Dlala umsindo"</item>
     <item msgid="136815868796597058">"Funda ibhodi lokunamathisela"</item>
     <item msgid="5238692940326972503">"Shintsha ibhodi lokunamathisela"</item>
+    <item msgid="5753789168376302997">"Izinkinobho zabezindaba"</item>
+    <item msgid="3265262911688671938">"Ukugxila komsindo"</item>
+    <item msgid="2098976479485046797">"Ivolumu kangqo"</item>
+    <item msgid="5660213838861789350">"Ivolumu yezwi"</item>
+    <item msgid="7983336752371254444">"Ivolumu yokukhala"</item>
+    <item msgid="7878027809189330917">"Ivolumu yabezindaba"</item>
+    <item msgid="7260546305036218513">"Ivolumu ye-alamu"</item>
+    <item msgid="9103719301075748925">"Ivolumu yesaziso"</item>
+    <item msgid="7025966722295861512">"Ivolumu ye-Bluetooth"</item>
+    <item msgid="4665183401128289653">"Gcina kuphapheme"</item>
+    <item msgid="8584357129746649222">"Indawo"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kufushane"</item>
     <item msgid="2560532955514699713">"Okulingene"</item>
     <item msgid="2372711992605524591">"Kude"</item>
   </string-array>
+  <string-array name="select_runtime_titles">
+    <item msgid="3574453009229338122">"I-Dalvik"</item>
+    <item msgid="8978402910750533864">"UBUCIKO"</item>
+    <item msgid="7839859333977894115">"UBUCIKO (ukulungisa iphutha)"</item>
+  </string-array>
+  <string-array name="select_runtime_summaries">
+    <item msgid="6412880178297884701">"Sebenzisa i-Dalvik"</item>
+    <item msgid="5131846588686178907">"Sebenzisa UBUCIKO"</item>
+    <item msgid="4530003713865319928">"Sebenzisa ukwakha kokulungisa iphutha LOBUCIKO"</item>
+  </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"Akusoze kuhlole"</item>
     <item msgid="6042769699089883931">"Hlola okuqukethwe kwe-DRM kuphela"</item>
@@ -367,6 +400,11 @@
     <item msgid="8272260411216018353">"Kusikrini njengemigqa"</item>
     <item msgid="120512413928262547">"Ku-adb shell dumpsys gfxinfo"</item>
   </string-array>
+  <string-array name="debug_hw_overdraw_entries">
+    <item msgid="8190572633763871652">"Valiwe"</item>
+    <item msgid="7688197031296835369">"Bonisa izindawo zokukhipha okungaphezulu"</item>
+    <item msgid="8332661909019981149">"Bonisa ikhawunda yokukhipha okungaphezulu"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Isilanganiso esivamile"</item>
     <item msgid="4071574792028999443">"Azikho izinqubo zesizinda"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 0611c7f7387..8b8f84926b0 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -275,8 +275,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_warning_multiuser" product="tablet" msgid="6458990250829214777">"Uma uvumela ukuzulazula kwedatha, ungahle ufake ebucayini amashaji okuzula amancane!\n\nLesi silungiselelwa sithinta bonke abasebenzisi kule thebulethi."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Uma uvumela ukuzulazula kwedatha, ungahle ufake ebucayini amashaji okuzula amancane!\n\nLesi silungiselelwa sithinta bonke abasebenzisi kule foni."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Vumela ukuhamba kwedatha?"</string>
     <string name="networks" msgid="6333316876545927039">"Inketho yo-opheretha"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Khetha inkamapani yenethiwekhi"</string>
@@ -322,8 +322,8 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Dinga i-PIN yenombolo noma iphasiwedi ukubonisa umbhalo wemfihlo kwithebhulethi ngazo zonke izikhathi lapho uyivula"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Dinga i-PIN yenombolo noma iphasiwedi ukungabhali ngemfihlo ifoni yakho njalo lapho uyivula"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Betheliwe"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Ungabethela ama-akhawunti wakho, izilungiselelo, ulande izinhlelo zokusebenza nedatha yazo, imidiya, namanye amafayela. Uma usubethele ikhompyutha yakho, udinga ukuthayipha i-PIN yenombolo noma iphasiwedi ukususa ukubhala ngekhodi ngaso isikathi ukhanyisa: awukwazi ukususa ukubhala ngakhodi ikhompyutha yakho ngaphandle kokwenza kabusha idatha yakho yenkampani, sula yonke idatha yakho."\n\n"Ukubhala ngekhodi kuthatha ihora noma ngaphezulu. Kufanele uqale ngebhtri elishajiwe futhi ugcine ikhompyutha yakho iplakiwe kuze kuphele ukubethela. Uma uphazamisa inqubo yokubethela, uzolahlekelwa enye noma yonke idatha yakho."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Ungabhala ngakhodi ama-akhawunti wakho, izilungiselelo, ulande ama-apps nedatha yawo, imidiya namanye amafayela. Uma usubhale ngekhodi ucingo lakho, udinga ukuthayipha i-PIN yezinombolo noma iphasiwedi ukususa ukubhala ngakhodi ngaso sonke isikhathi uma uyikhanyisa: awukwazi ukususa ukubhala ngekhodi ucingo lakho ngaphandle kokwenza ukusetha kabusha idatha yenkampani, ususe yonke idatha yakho."\n\n"Ukubhala ngekhodi kuthatha ihora noma ngaphezulu. Kufanele uqale ngebhitri elishajiwe futhi ugcine ucingo lakho luplakiwe kuze ukubhala ngekhodi kuqedele. Uma uphazamisa inqubo yokubhala ngekhodi, uzolahlekelwa enye noma yonke idatha yakho."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Ungabethela ama-akhawunti wakho, izilungiselelo, ulande izinhlelo zokusebenza nedatha yazo, imidiya, namanye amafayela. Uma usubethele ikhompyutha yakho, udinga ukuthayipha i-PIN yenombolo noma iphasiwedi ukususa ukubhala ngekhodi ngaso isikathi ukhanyisa: awukwazi ukususa ukubhala ngakhodi ikhompyutha yakho ngaphandle kokwenza kabusha idatha yakho yenkampani, sula yonke idatha yakho.\n\nUkubhala ngekhodi kuthatha ihora noma ngaphezulu. Kufanele uqale ngebhtri elishajiwe futhi ugcine ikhompyutha yakho iplakiwe kuze kuphele ukubethela. Uma uphazamisa inqubo yokubethela, uzolahlekelwa enye noma yonke idatha yakho."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Ungabhala ngakhodi ama-akhawunti wakho, izilungiselelo, ulande ama-apps nedatha yawo, imidiya namanye amafayela. Uma usubhale ngekhodi ucingo lakho, udinga ukuthayipha i-PIN yezinombolo noma iphasiwedi ukususa ukubhala ngakhodi ngaso sonke isikhathi uma uyikhanyisa: awukwazi ukususa ukubhala ngekhodi ucingo lakho ngaphandle kokwenza ukusetha kabusha idatha yenkampani, ususe yonke idatha yakho.\n\nUkubhala ngekhodi kuthatha ihora noma ngaphezulu. Kufanele uqale ngebhitri elishajiwe futhi ugcine ucingo lakho luplakiwe kuze ukubhala ngekhodi kuqedele. Uma uphazamisa inqubo yokubhala ngekhodi, uzolahlekelwa enye noma yonke idatha yakho."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Bethela ithebhulethi"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Bethela ifoni"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Sicela ushaje ibhetri yakho bese uzama futhi."</string>
@@ -339,8 +339,8 @@
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Zama futhi emasekhondini angu-<xliff:g id="DELAY">^1</xliff:g>."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Thayipha iphasiwedi yakho"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Ubhala ngokufihlekileyo akuphumelelanga"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Ukubethela kuphazamisekile futhi ngeke kusaphela. Ngenxa yalokho, akusafinyeleleki kwidatha ekuthebhulethi yakho. "\n\n"Ukuze uphinde usebenzise ithebhulethi yakho, kufanele isethwe kabusha. Uma ususetha ithebhulethi yakho emuva kokuba isethwe kabusha, uzothola ithuba lokubuyisa nanoma iyiphi idatha eyayilondolozwe kwi-akhawunti yakho yakwa-Google.."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Ukubhelake bumfihlo kuphazamisekile futhi ngeke kusaphela. Ngenxa yalokho, akusafinyeleleki kwidatha esocingweni lwakho. "\n\n"Ukuze uphinde usebenzise ucingo lwakho, kufanele lusethwe kabusha endaweni yokukhanda. Uma ususetha ucingo lwakho emva kokuba lusethwe kabusha, uzothola ithuba lokubuyisa nanoma iyiphi idatha eyayilondolozwe kwi-akhawunti yakho yakwa-Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Ukubethela kuphazamisekile futhi ngeke kusaphela. Ngenxa yalokho, akusafinyeleleki kwidatha ekuthebhulethi yakho. \n\nUkuze uphinde usebenzise ithebhulethi yakho, kufanele isethwe kabusha. Uma ususetha ithebhulethi yakho emuva kokuba isethwe kabusha, uzothola ithuba lokubuyisa nanoma iyiphi idatha eyayilondolozwe kwi-akhawunti yakho yakwa-Google.."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Ukubhelake bumfihlo kuphazamisekile futhi ngeke kusaphela. Ngenxa yalokho, akusafinyeleleki kwidatha esocingweni lwakho. \n\nUkuze uphinde usebenzise ucingo lwakho, kufanele lusethwe kabusha endaweni yokukhanda. Uma ususetha ucingo lwakho emva kokuba lusethwe kabusha, uzothola ithuba lokubuyisa nanoma iyiphi idatha eyayilondolozwe kwi-akhawunti yakho yakwa-Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Shintsha indlela yokufaka"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Khetha isivali sesikrini"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Khetha ukukhiywa kokulondoloza"</string>
@@ -514,6 +514,7 @@
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Iyaxhuma"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Ixhunyiwe"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Kuyatholakala"</string>
+    <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Kuyasebenza"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Bonisa izilungiselelo"</string>
     <string name="wifi_display_disconnect_title" msgid="1543715924639003599">"Nqamula?"</string>
     <string name="wifi_display_disconnect_text" msgid="4824860802264489088">"Lokhu kuzophelisa uxhumano nge:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -532,7 +533,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Valiwe"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Ayitholakali ngoba i-NFC icishiwe"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"i-Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Uma kuvulwe lesi sici, ungadlulisa okuqukethwe okusetshenziswayo kwenye ikhebuli ye-NFC ngokumisa amadivayisi enye eduze kwenye. Isibonelo ungahlanganisa amakhasi Esiphequluli, amavidiyo ka-YouTube, kwezokuxhumana nabantu, kanye nokunye."\n\n"Hlanganisa amadivayisi ndawonye (ngokujwayelekile enye ngemuva kwenye) bese uthinta isikrini sakho. Uhlelo lokusebenza luyathola ukuthi yini ezoba-beamed."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Uma kuvulwe lesi sici, ungadlulisa okuqukethwe okusetshenziswayo kwenye ikhebuli ye-NFC ngokumisa amadivayisi enye eduze kwenye. Isibonelo ungahlanganisa amakhasi Esiphequluli, amavidiyo ka-YouTube, kwezokuxhumana nabantu, kanye nokunye.\n\nHlanganisa amadivayisi ndawonye (ngokujwayelekile enye ngemuva kwenye) bese uthinta isikrini sakho. Uhlelo lokusebenza luyathola ukuthi yini ezoba-beamed."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Ukutholwa kwesevisi yenethiwekhi"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Vumela izinhlelo zokusebenza kwamanye amadivayisi ukuthola izinhlelo zokusebenza kule divayisi"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"I-Wi-Fi"</string>
@@ -620,7 +621,7 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Ivikelwe nge-<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", ivikelwe nge-<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Lutho"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Ukuze kuthuthukiswe ukufaneleka kwendawo nezinye izinjongo, i-<xliff:g id="APP_NAME">%1$s</xliff:g> ifuna ukuvula ukuskena kwenethiwekhi, noma ngabe i-Wi-Fi ivaliwe."\n\n"Vumela lokhu ngazo zonke izinhlelo zokusebenza ezifuna ukuskena?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Ukuze kuthuthukiswe ukufaneleka kwendawo nezinye izinjongo, i-<xliff:g id="APP_NAME">%1$s</xliff:g> ifuna ukuvula ukuskena kwenethiwekhi, noma ngabe i-Wi-Fi ivaliwe.\n\nVumela lokhu ngazo zonke izinhlelo zokusebenza ezifuna ukuskena?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Vumela"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Phika"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Xhuma kwi-inthanethi"</string>
@@ -632,8 +633,8 @@
     <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_skipped_message" product="tablet" msgid="3335132188969450252">"ISEXWAYISO: Ungahle uthole amashaji edatha enkampani yenethiwekhi angeziwe.\n\nUkusethwa kwethebulethi kungadinga umsebenzi wenethiwekhi omcane."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ISEXWAYISO: Ungahle uthole amashaji edatha enkampani yenethiwekhi angeziwe.\n\nUkusethwa kwefoni kungadinga umsebenzi wenethiwekhi omcane."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ISEXWAYISO: Kuze ube nokuxhunywa kwe-intanethi, ithebulethi angeke ize ikwazi ukuqinisekisa ukuthi isofthiwe yakho isesikhathini samanje."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ISEXWAYISO: Kuze ube nokuxhunywa kwe-intanethi, ifoni angeke ize ikwazi ukuqinisekisa ukuthi isofthiwe yakho isesikhathini samanje."</string>
     <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Ithebhulethi ayikwazanga ukuxhuma kule nethiwekhi ye-Wi-Fi."</string>
@@ -773,9 +774,9 @@
     <string name="sim_change_pin" msgid="7328607264898359112">"I-SIM PIN"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"I-PIN Engalungile!"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"Ama-PIN awafani"</string>
-    <string name="sim_change_failed" msgid="304964924772218382">"Ayikwazi ukushintsha i-PIN."\n"Mhlawumbe i-PIN engalungile"</string>
+    <string name="sim_change_failed" msgid="304964924772218382">"Ayikwazi ukushintsha i-PIN.\nMhlawumbe i-PIN engalungile"</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"I-PIN ye-SIM ishintshwe ngempumelelo"</string>
-    <string name="sim_lock_failed" msgid="5651596916127873626">"Ayikwazi ukushintsha isimo sokuvala ikhadi le-SIM."\n"Kungenzeka i-PIN engalungile."</string>
+    <string name="sim_lock_failed" msgid="5651596916127873626">"Ayikwazi ukushintsha isimo sokuvala ikhadi le-SIM.\nKungenzeka i-PIN engalungile."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"KULUNGILE"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Khansela"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Isimo sethebhulethi"</string>
@@ -919,9 +920,9 @@
     <string name="master_clear_title" msgid="5907939616087039756">"Ukuhlela kabusha idatha yasembonini"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Isula yonke idatha kwithebhulethi"</string>
     <string name="master_clear_summary" product="default" msgid="4986154238001088492">"Isula yonke idatha kwifoni"</string>
-    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Lokhu kuzosusa yonke idatha "<b>"ekwistoreji sangaphakathi kuthebhulethi yakho"</b>", ehlanganisa:"\n\n<li>"I-akhawunti yakho ye-Google"</li>\n<li>"Uhlelo lokusebenza kanye nezilungiselelo"</li>\n<li>"Izinhlelo zokusebenza ezilayishiwe"</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Lokhu kuzosusa yonke idatha "<b>"ekwisitoreji sangaphakathi sefoni yakho"</b>", ehlanganisa:"\n\n<li>"I-akhawunti yakho ye-Google"</li>\n<li>"Uhlelo lokusebenza kanye nezilungiselelo"</li>\n<li>"Izinhlelo zokusebenza ezilayishiwe"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n"Okwamanje ungene ngemvume kuma-akhawunti alandelayo:"\n\n</string>
+    <string name="master_clear_desc" product="tablet" msgid="8317211882509025841">"Lokhu kuzosusa yonke idatha "<b>"ekwistoreji sangaphakathi kuthebhulethi yakho"</b>", ehlanganisa:\n\n"<li>"I-akhawunti yakho ye-Google"</li>\n<li>"Uhlelo lokusebenza kanye nezilungiselelo"</li>\n<li>"Izinhlelo zokusebenza ezilayishiwe"</li></string>
+    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Lokhu kuzosusa yonke idatha "<b>"ekwisitoreji sangaphakathi sefoni yakho"</b>", ehlanganisa:\n\n"<li>"I-akhawunti yakho ye-Google"</li>\n<li>"Uhlelo lokusebenza kanye nezilungiselelo"</li>\n<li>"Izinhlelo zokusebenza ezilayishiwe"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n"Okwamanje ungene ngemvume kuma-akhawunti alandelayo:\n\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Umculo"</li>\n<li>"Izithombe"</li>\n<li>"Enye idatha yomsebenzisi"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ukusula futhi umculo, izithombe, nenye idatha yomsebenzisi, "<b>" indawo yokugcina ye-USB"</b>"idinga ukusulwa."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Ukusula umculo, izithombe, nenye imininingo yomsebenzisi, "<b>"ikhadi le-SD"</b>"kumele lisuswe."</string>
@@ -1106,7 +1107,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Bonisa izinqubo zokulondoloza kwesikhashana"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Setha kabusha izintandokazi zezinhlelo zokusebenza"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Setha kabusha izintandokazi zohlelo lokusebenza?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Lokhu kuzosetha kabusha zonke izintandokazi ze:"\n\n" "<li>"Izinhlelo zokusebenza ezikhutshaziwe"</li>\n" "<li>"Izaziso zezinhlelo zokusebenza ezikhutshaziwe"</li>\n" "<li>"Izinhlelo zokusebenza zokuzenzakalelayo zezenzo"</li>\n" "<li>"Idatha yangokwasemuva yezinhlelo zokusebenza"</li>\n\n" Ngeke ulahlekelwe idatha yohlelo lokusebenza."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Lokhu kuzosetha kabusha zonke izintandokazi ze:\n\n "<li>"Izinhlelo zokusebenza ezikhutshaziwe"</li>\n" "<li>"Izaziso zezinhlelo zokusebenza ezikhutshaziwe"</li>\n" "<li>"Izinhlelo zokusebenza zokuzenzakalelayo zezenzo"</li>\n" "<li>"Idatha yangokwasemuva yezinhlelo zokusebenza"</li>\n\n" Ngeke ulahlekelwe idatha yohlelo lokusebenza."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Setha kabusha izinhlelo zokusebenza"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Lawula isikhala"</string>
     <string name="filter" msgid="2018011724373033887">"Hlunga"</string>
@@ -1247,9 +1248,7 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Ukuze ushintshe, cindezela u-Control-Spacebar"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Okuzenzakalelayo"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Izendlalelo zekhibhodi"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Sebenzisa isichazamazwi"</string>
-    <string name="user_dict_single_settings_title" msgid="524997218433540614">"Isichazamazwi sakho"</string>
-    <string name="user_dict_multiple_settings_title" msgid="3735224433307996276">"Izichazamazwi eziqondene nawe"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Isichazamazwi somuntu siqu"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Engeza"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Faka kwisichazamazwi"</string>
@@ -1310,6 +1309,11 @@
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Faka phakathi inketho kumenyu yamandla yokuthatha umbiko wesiphazamiso"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Hlala uphapheme"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Isikrini asisoze salala ngenkathi sishaja"</string>
+    <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Nika amandla i-Bluetooth HCI yelogu lokuhlola"</string>
+    <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Shutha wonke amaphakethe we-bluetooth HCI kufayela"</string>
+    <string name="select_runtime_title" msgid="649783802363155346">"Khetha isikhathi sokusebenza"</string>
+    <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Khetha isikhathi sokusebenza"</string>
+    <string name="select_runtime_warning_message" msgid="1937574953265648165">"Qalisa kabusha ukuze ushintshe isikhathi sokusebenza kusukela ku-<xliff:g id="OLD">%1$s</xliff:g> ngu-<xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Vumela izindawo mbumbulu"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Vumela izindawo mbumbulu"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Vumela ukulungisa iphutha le-USB?"</string>
@@ -1322,11 +1326,13 @@
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Vikela isilondolozi se-USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Izinhlelo zokusebenza kufanele zicele imvume yokufunda isilondolozi se-USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Vikela isilondolozi se-USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Uma isilondolozi se-USB sivikelekile, izinhlelo zokusebenza kufanele zicele imvume yokufunda idatha kusuka kwisilondolozi sangaphandle."\n\n"Ezinye izinhlelo zokusebenza zingahle zingasebenzi zize zibuyekezwe onjiniyela bazo."</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Uma isilondolozi se-USB sivikelekile, izinhlelo zokusebenza kufanele zicele imvume yokufunda idatha kusuka kwisilondolozi sangaphandle.\n\nEzinye izinhlelo zokusebenza zingahle zingasebenzi zize zibuyekezwe onjiniyela bazo."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Vikela ikhadi le-SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Izinhlelo zokusebenza kufanele zicele imvume yokufunda ikhadi le-SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vikela ikhadi le-SD?"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Uma ikhadi le-SD livikelekile, izinhlelo zokusebenza kufanele zicele imvume yokufunda idatha ngesilondolozi sangaphandle."\n\n"Ezinye izinhlelo zokusebenza zingahle zingasebenzi zize zibuyekezwe onjiniyela bazo."</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Uma ikhadi le-SD livikelekile, izinhlelo zokusebenza kufanele zicele imvume yokufunda idatha ngesilondolozi sangaphandle.\n\nEzinye izinhlelo zokusebenza zingahle zingasebenzi zize zibuyekezwe onjiniyela bazo."</string>
+    <string name="enable_terminal_title" msgid="95572094356054120">"Itheminali yasendaweni"</string>
+    <string name="enable_terminal_summary" msgid="67667852659359206">"Nika amandla uhlelo lokusebenza letheminali olunikeza ukufinyelela kwasendaweni kwe-shell"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Khetha igajethi"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Khetha iwijethi"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Yenza iwijethi bese uvumela ukufinyeleleka?"</string>
@@ -1347,11 +1353,11 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Amasevisi"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Isistimu"</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_screen_magnification_summary" msgid="2380627654189671754">"Uma lesi sici sivuliwe, ungasondeza futhi unciphise ngokucindezela kathathu isikrini.\n\nNgenkathi kusondeziwe, ungahle:\n"<ul><li>"Uyise emaceleni: Hudula iminwe emibili noma eminingi esikrinini."</li>\n<li>"Lungisa ileveli zokusondeza: Cindezela iminwe emibili noma eminingi noma uyihlukanise."</li></ul>\n\n"Futhi ungahle ukhulise okwesikhashana okungaphandi komunwe wakho ngokucindezela kathathu futhi ubambe. Kuleli zinga lokukhulisa, ngahudula umunwe wakho ukuze uhlole izingxenye ezahlukahlukene zesikrini. Phakamisa umunwe wakho ukuze ubuyele esimeni sangaphambilini.\n\nQaphela: Ukucindezela kathathu kusebenza noma ikuphi ngaphandle kwekhibhodi nebha lokuzula."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Isinqamuleli sokufinyelela"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Vuliwe"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Valiwe"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Uma lesi sici sivuliwe, unganika amandla ngokushesha izici zokufinyelela ngezinyathelo ezimbili:"\n\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_global_gesture_preference_description" msgid="750438015254396963">"Uma lesi sici sivuliwe, unganika amandla ngokushesha izici zokufinyelela ngezinyathelo ezimbili:\n\nIsinyathelo 1: Cindezela futhi ubambe inkinobho vula/cisha uze uzwe umsindo noma uzwe ukudlidliza.\n\nIsinyathelo 2: Cindezela futhi ubambe ngeminwe emibili uze uzwe ukuqinisekisa komsindo.\n\nUma idivayisi inabasebenzisi abaningi, ukusebenzisa isinqamuleli esikrinini sokukhiya kunika amandla okwesikhashana ukufinyelela kuze kuvuleke idivayisi."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Umbhalo omkhulu"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Isisondezi-skrini"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Buyekeza ngokuzenzakalela isisondezi-skrini"</string>
@@ -1373,6 +1379,16 @@
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"I-TalkBack inikeza usizo lokuphendula kwezi ukuze kusizakale abangaboni kanye nalabo ababona kancane. Ingabe uyafuna ukuyifaka mahhala uyithola Emaketheni ye-Android?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Akukho ncazelo enikeziwe."</string>
     <string name="settings_button" msgid="3006713718908152930">"Izilungiselelo"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Ukuphrinta"</string>
+    <string name="print_settings_title" msgid="4911263339115736689">"Izilungiselelo zokuphrinta"</string>
+    <string name="print_services_title" msgid="1088097751249445946">"Amasevisi"</string>
+    <string name="print_service_security_warning_title" msgid="2338435517408144841">"Sebenzisa i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="print_service_security_warning_summary" msgid="919299459931111450">"I-<xliff:g id="PRINT_SERVICE_NAME">%1$s</xliff:g> ingathola amadokhumenti owaphrintayo. Amadokhumenti anjalo angaqukatha idatha ebucayi."</string>
+    <string name="print_no_services_installed" msgid="8443039625463872294">"Awekho amasevisi afakiwe"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Izilungiselelo"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Engeza amaphrinta"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Vuliwe"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Valiwe"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Ibhetri"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Yini ekade isebenzisa ibhetri"</string>
     <string name="power_usage_not_available" msgid="3214000535532434353">"Idatha esebenzisa ibhethri ayitholakali."</string>
@@ -1412,8 +1428,10 @@
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"I-Wi-Fi iyasebenza"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Ithebhulethi"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Ifoni"</string>
-    <string name="usage_type_data_send" msgid="2857401966985425427">"Idatha ithunyelwe"</string>
-    <string name="usage_type_data_recv" msgid="7251090882025234185">"Idatha etholiwe"</string>
+    <string name="usage_type_data_send" msgid="3875198715268918671">"Idatha yeselula ethunyelwe"</string>
+    <string name="usage_type_data_recv" msgid="6694951443404021754">"Idatha yeselula etholakele"</string>
+    <string name="usage_type_data_wifi_send" msgid="7178327382353096029">"Idatha ye-Wi‑Fi ethunyelwe"</string>
+    <string name="usage_type_data_wifi_recv" msgid="7822328607564241372">"Idatha ye-Wi‑Fi etholakele"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Umsindo"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Ividiyo"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Isikhathi sivuliwe"</string>
@@ -1467,6 +1485,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ukuphakama"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Ithinta ithoni yombhalo okhulunyiwe"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Ulimi"</string>
+    <string name="tts_lang_not_selected" msgid="7395787019276734765">"Ulimi alukhethwanga"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Ihlela izwi lolimi oluthize lombhalo okhulunyiwe"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Lalela isibonelo"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Dlala umboniso omfushane wamazwi"</string>
@@ -1601,7 +1620,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"I-EAP ayisekelwa"</string>
     <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Awukwazi ukulungiselela uxhumano lwe-EAP Wi-Fi phakathi nokusetha. Emva kokusetha, ungenza kanjalo kuzilungiselelo &gt; okungenazintambo namanethiwekhi"</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Ukuxhuma kungathatha amaminithi ambalwa..."</string>
-    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Thinta"<b>"Okulandelayo"</b>" ukuqhubeka nokusetha."\n\n"Thinta"<b>"Emuva"</b>" ukuxhuma kuhleloxhumano olwehlukile."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Thinta"<b>"Okulandelayo"</b>" ukuqhubeka nokusetha.\n\nThinta"<b>"Emuva"</b>" ukuxhuma kuhleloxhumano olwehlukile."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Ukunika amandla kuvumelanisiwe"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Ukuvumelanisa kukhubaziwe"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Iphutha lokuvumelanisa."</string>
@@ -1683,8 +1702,7 @@
     <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="debug_hw_overdraw" msgid="2968692419951565417">"Susa iphutha lokukhipha okungaphezulu kwe-GPU"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Khubaza izimbondela ze-HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Njalo sebenzisa i-GPU ukwakha isikrini"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Nika amandla ukulandelwa komkhondo kwe-OpenGL"</string>
@@ -1745,11 +1763,11 @@
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Khubaza idatha yokwangasemuva kumanethiwekhi eselula. Amanethiwekhi okungewona eselula azosetshenziswa uma etholakala."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Ukuze ubeke umkhawulo wezisetshenziswa zangemuva zalesi sisetshenziswa, qala ulungise umkhawulo wemininingo yeselula."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Beka isivimbelo kwimininingo yemininingo egciniwe?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Lesi sici singahle sibangele uhlelo lokusebenza olukhosele kudatha yokwangasemuva ukungasasebenzi uma amanethiwekhi kuphela eselula atholakala."\n\n"Ungathola ukulawula kokusetshenziswa kwedatha okufanele kuzilungiselelo ezitholakalayo ngaphakathi kohlelo lokusebenza."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Lesi sici singahle sibangele uhlelo lokusebenza olukhosele kudatha yokwangasemuva ukungasasebenzi uma amanethiwekhi kuphela eselula atholakala.\n\nUngathola ukulawula kokusetshenziswa kwedatha okufanele kuzilungiselelo ezitholakalayo ngaphakathi kohlelo lokusebenza."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Imininingo yangemuva engavumelekile itholakala kuphela uma ubeke umkhawulo wemininingo yeselula."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Khanyisa ukuvumelanisa idatha ngokuzenzakalelayo?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Noma iziphi izinguquko ozenzayo kuma-akhawunti wakho kuwebhu zizokopishelwa ngokuzenzakalela efonini yakho."\n\n"Amanye ama-akhawunti angakopisha ngokuzenzakalela noma iziphi izinguquko ozenzayo kuthebulethi kuya kuwebhu. I-akhawunti yakwa-Google isebenza ngale ndlela."\n\n"Ukuze ukhethe ukuthi uluphi uhlobo lolwazi ongaluvumelanisa ngaphakathi kwe-akhawunti ngayinye, iya kuzilungiselelo &gt; ama-akhawunti."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Noma iziphi izinguquko ozenzayo kuma-akhawunti wakho kuwebhu zizokopishelwa ngokuzenzakalela efonini yakho."\n\n"Amanye ama-akhawunti angakopisha ngokuzenzakalela noma iziphi izinguquko ozenzayo efonini kuya kuwebhu. I-akhawunti yakwa-Google isebenza ngale ndlela."\n\n"Ukuze ukhethe ukuthi uluphi uhlobo lolwazi ongaluvumelanisa ngaphakathi kwe-akhawunti ngayinye, iya kuzilungiselelo &gt; ama-akhawunti."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Noma iziphi izinguquko ozenzayo kuma-akhawunti wakho kuwebhu zizokopishelwa ngokuzenzakalela efonini yakho.\n\nAmanye ama-akhawunti angakopisha ngokuzenzakalela noma iziphi izinguquko ozenzayo kuthebulethi kuya kuwebhu. I-akhawunti yakwa-Google isebenza ngale ndlela.\n\nUkuze ukhethe ukuthi uluphi uhlobo lolwazi ongaluvumelanisa ngaphakathi kwe-akhawunti ngayinye, iya kuzilungiselelo &gt; ama-akhawunti."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Noma iziphi izinguquko ozenzayo kuma-akhawunti wakho kuwebhu zizokopishelwa ngokuzenzakalela efonini yakho.\n\nAmanye ama-akhawunti angakopisha ngokuzenzakalela noma iziphi izinguquko ozenzayo efonini kuya kuwebhu. I-akhawunti yakwa-Google isebenza ngale ndlela.\n\nUkuze ukhethe ukuthi uluphi uhlobo lolwazi ongaluvumelanisa ngaphakathi kwe-akhawunti ngayinye, iya kuzilungiselelo &gt; ama-akhawunti."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Cima ukuvumelanisa idatha ngokuzenzakalela?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Lokhu kuzokonga ukusetshenziswa kwedatha nebhethri, kepha uzodinga ukuvumelanisa i-akhawunti ngayinye ngokwenza ukuze uqoqe ulwazi lakamuva. Futhi ngeke uthole izaziso uma izibuyekezo zivela."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Usuku lokuhlela kabusha umjikelezo wokusebenza"</string>
@@ -1758,12 +1776,12 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Setha isexwayiso sokusebenziseka kwedatha"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Setha umkhawulo wokusetshenziswa kwedatha"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ilinganisela ukusebenza kwedatha"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Uxhumo lwedatha yakho yeselula luzokhubazwa uma uma umkhawulo ocacisiwe usufinyelelwe."\n\n"Njengoba ukusetshenziswa kwedatha kukalwa ngethebulethi yakho, kanti nenkampani yakho yenethiwekhi ungabhekana nokusetshenziswa ngokwehlukile, naka ukusebenzisa umkhawulo olandelanayo."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Uxhumo lwedatha yakho yeselula luzokhubazwa uma umkhawulo ocacisiwe usufinyelelwe."\n\n"Njengoba ukusetshenziswa kwedatha kukalwa ngefoni yakho, kanti nenkampani yakho yenethiwekhi ungabhekana nokusetshenziswa ngokwehlukile, naka ukusebenzisa umkhawulo olandelanayo."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Uxhumo lwedatha yakho yeselula luzokhubazwa uma uma umkhawulo ocacisiwe usufinyelelwe.\n\nNjengoba ukusetshenziswa kwedatha kukalwa ngethebulethi yakho, kanti nenkampani yakho yenethiwekhi ungabhekana nokusetshenziswa ngokwehlukile, naka ukusebenzisa umkhawulo olandelanayo."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Uxhumo lwedatha yakho yeselula luzokhubazwa uma umkhawulo ocacisiwe usufinyelelwe.\n\nNjengoba ukusetshenziswa kwedatha kukalwa ngefoni yakho, kanti nenkampani yakho yenethiwekhi ungabhekana nokusetshenziswa ngokwehlukile, naka ukusebenzisa umkhawulo olandelanayo."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Gwema ukusebenza kwedatha yangemuva?"</string>
     <string name="data_usage_restrict_background" msgid="8447934953579275363">"Uma ukhawulela idatha yeselula yokwangasemuva, ezinye izinhlelo zokusebenza kanye namasevisi ngeke kusebense ngaphandle uma uxhumeke kunethiwekhini ye-Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Uma ukhawulela idatha yokwangasemuva, ezinye izinhlelo zokusebenza namasevisi ngeke kusebenze ngaphandle nje kokuthi uxhumeke kunethiekhi ye-Wi-Fi."\n\n"Lesi silungiselelo sithinta bonke abasebenzisi kule thebulethi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Uma ukhawulela idatha yokwangasemuva, ezinye izinhlelo zokusebenza namasevisi ngeke kusebenze ngaphandle nje kokuthi uxhumeke kunethiekhi ye-Wi-Fi."\n\n"Lesi silungiselelo sithinta bonke abasebenzisi kule foni."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Uma ukhawulela idatha yokwangasemuva, ezinye izinhlelo zokusebenza namasevisi ngeke kusebenze ngaphandle nje kokuthi uxhumeke kunethiekhi ye-Wi-Fi.\n\nLesi silungiselelo sithinta bonke abasebenzisi kule thebulethi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Uma ukhawulela idatha yokwangasemuva, ezinye izinhlelo zokusebenza namasevisi ngeke kusebenze ngaphandle nje kokuthi uxhumeke kunethiekhi ye-Wi-Fi.\n\nLesi silungiselelo sithinta bonke abasebenzisi kule foni."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"isexwayiso"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"umkhawulo"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Izinhlelo zokusebenza zisusiwe"</string>
@@ -1850,8 +1868,8 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Umsebenzisi"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Iphrofayela evinjelwe"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Engeza umsebenzisi omusha"</string>
-    <string name="user_add_user_message_long" msgid="3086244205384741788">"Ungabelana ngale divayisi nabanye abantu ngokudala abasebenzisi abangeziwe. Umsebenzisi ngamunye unesikhala sakhe, lapha angenza khona ngezifiso izinhlelo zakhe zokusebenza, isithombe sangemuva, nokunye. Abasebenzisi futhi balungisa izilungiselelo zethebhulethi njenge-Wi-Fi ethinta wonke umuntu."\n\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_add_user_message_long" msgid="3086244205384741788">"Ungabelana ngale divayisi nabanye abantu ngokudala abasebenzisi abangeziwe. Umsebenzisi ngamunye unesikhala sakhe, lapha angenza khona ngezifiso izinhlelo zakhe zokusebenza, isithombe sangemuva, nokunye. Abasebenzisi futhi balungisa izilungiselelo zethebhulethi njenge-Wi-Fi ethinta wonke umuntu.\n\nNgemva kokudala umsebenzisi omusha, loyo muntu udinga ukwenza inqubo yokusetha.\n\nNoma imuphi umsebenzisi angabuyekeza izimvume zohlelo lokusebenza engxenyeni yabo bonke abanye abasebenzisi."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Ngemva kokudala umsebenzisi omusha, loyo muntu udinga ukwenza inqubo yokusetha.\n\nNoma imuphi umsebenzisi angamukela izimvume zohlelo lokusebenza ezibuyekeziwe engxenyeni yabo bonke abanye abasebenzisi."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Setha umsebenzisi manje?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Qiniseka ukuthi umuntu uyatholakala ukuthatha ithebulethi futhi asethe isikhala sakhe"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Setha iphrofayela manje?"</string>
@@ -1882,6 +1900,9 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Lesi silungiselelo sithinta bonke abasebenzisi kule foni."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Shintsha ulimi"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Shintsha usayizi wefonti"</string>
+    <string name="restriction_settings_title" msgid="4233515503765879736">"Izinciphiso"</string>
+    <string name="restriction_menu_reset" msgid="2067644523489568173">"Susa izinciphiso"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"Shintsha i-PIN"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"Bonisa izaziso"</string>
     <string name="help_label" msgid="1107174367904110532">"Usizo"</string>
     <string name="user_account_title" msgid="1127193807312271167">"I-akhawunti yokuqukethwe"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1a11ebb9f5a..a4de07042f7 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -210,6 +210,7 @@
         <item>Dies ist ein Beispiel für Sprachsynthese in Deutsch.</item>
         <item>Questo è un esempio di sintesi vocale in italiano.</item>
         <item>Este es un ejemplo de síntesis de voz en español.</item>
+        <item>이것은 한국어 음성 합성의 예입니다.</item>
     </string-array>
     <string-array name="tts_demo_string_langs" translatable="false">
         <item>eng</item>
@@ -217,6 +218,7 @@
         <item>deu</item>
         <item>ita</item>
         <item>spa</item>
+        <item>kor</item>
     </string-array>
 
 
@@ -570,7 +572,7 @@
         <item>gid</item>
     </string-array>
 
-    <!-- Apps on SD instalaltion location options in ApplicationSettings -->
+    <!-- Apps on SD installation location options in ApplicationSettings -->
     <string-array name="app_install_location_entries">
         <item>Internal device storage</item>
         <item>Removable SD card</item>
@@ -589,6 +591,7 @@
         <item>Location</item>
         <item>Personal</item>
         <item>Messaging</item>
+        <item>Media</item>
         <item>Device</item>
     </string-array>
 
@@ -625,6 +628,18 @@
         <item>play audio</item>
         <item>read clipboard</item>
         <item>modify clipboard</item>
+        <item>media buttons</item>
+        <item>audio focus</item>
+        <item>master volume</item>
+        <item>voice volume</item>
+        <item>ring volume</item>
+        <item>media volume</item>
+        <item>alarm volume</item>
+        <item>notification volume</item>
+        <item>bluetooth volume</item>
+        <item>keep awake</item>
+        <item>monitor location</item>
+        <item>monitor high power location</item>
     </string-array>
 
     <!-- User display names for app ops codes -->
@@ -643,15 +658,15 @@
         <item>Post notification</item>
         <item>Location</item>
         <item>Call phone</item>
-        <item>Receive SMS/MMS</item>
-        <item>Send SMS/MMS</item>
+        <item>Read SMS/MMS</item>
+        <item>Write SMS/MMS</item>
         <item>Receive SMS/MMS</item>
         <item>Receive SMS/MMS</item>
         <item>Receive SMS/MMS</item>
         <item>Receive SMS/MMS</item>
         <item>Send SMS/MMS</item>
-        <item>Receive SMS/MMS</item>
-        <item>Send SMS/MMS</item>
+        <item>Read SMS/MMS</item>
+        <item>Write SMS/MMS</item>
         <item>Modify settings</item>
         <item>Draw on top</item>
         <item>Access notifications</item>
@@ -660,6 +675,18 @@
         <item>Play audio</item>
         <item>Read clipboard</item>
         <item>Modify clipboard</item>
+        <item>Media buttons</item>
+        <item>Audio focus</item>
+        <item>Master volume</item>
+        <item>Voice volume</item>
+        <item>Ring volume</item>
+        <item>Media volume</item>
+        <item>Alarm volume</item>
+        <item>Notification volume</item>
+        <item>Bluetooth volume</item>
+        <item>Keep awake</item>
+        <item>Location</item>
+        <item>Location</item>
     </string-array>
 
     <!-- Titles for the list of long press timeout options. -->
@@ -679,6 +706,191 @@
         <item>1500</item>
     </string-array>
 
+    <!-- Titles for captioning typeface preference. [CHAR LIMIT=35] -->
+    <string-array name="captioning_typeface_selector_titles">
+        <item>Default</item>
+        <item>Sans-serif</item>
+        <item>Sans-serif condensed</item>
+        <item>Serif</item>
+        <item>Monospace</item>
+    </string-array>
+
+    <!-- Values for captioning typeface preference. -->
+    <string-array name="captioning_typeface_selector_values" translatable="false" >
+        <item></item>
+        <item>sans-serif</item>
+        <item>sans-serif-condensed</item>
+        <item>serif</item>
+        <item>monospace</item>
+    </string-array>
+
+    <!-- Titles for captioning font size preference. [CHAR LIMIT=35] -->
+    <string-array name="captioning_font_size_selector_titles">
+        <item>Very small</item>
+        <item>Small</item>
+        <item>Normal</item>
+        <item>Large</item>
+        <item>Very large</item>
+    </string-array>
+
+    <!-- Values for captioning font size preference. -->
+    <string-array name="captioning_font_size_selector_values" translatable="false" >
+        <item>0.25</item>
+        <item>0.5</item>
+        <item>1.0</item>
+        <item>1.5</item>
+        <item>2.0</item>
+    </string-array>
+
+    <!-- Titles for captioning character edge type preference. [CHAR LIMIT=35] -->
+    <string-array name="captioning_edge_type_selector_titles">
+        <item>None</item>
+        <item>Outline</item>
+        <item>Drop shadow</item>
+    </string-array>
+
+    <!-- Values for captioning character edge type preference. -->
+    <integer-array name="captioning_edge_type_selector_values" translatable="false" >
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </integer-array>
+
+    <!-- Titles for captioning color preference. -->
+    <string-array name="captioning_color_selector_titles" translatable="false" >
+        <item>@string/color_white</item>
+        <item>@string/color_black</item>
+        <item>@string/color_red</item>
+        <item>@string/color_yellow</item>
+        <item>@string/color_green</item>
+        <item>@string/color_cyan</item>
+        <item>@string/color_blue</item>
+        <item>@string/color_magenta</item>
+    </string-array>
+
+    <!-- Values for captioning color preference. -->
+    <integer-array name="captioning_color_selector_values" translatable="false" >
+        <item>0xFFFFFFFF</item>
+        <item>0xFF000000</item>
+        <item>0xFFFF0000</item>
+        <item>0xFFFFFF00</item>
+        <item>0xFF00FF00</item>
+        <item>0xFF00FFFF</item>
+        <item>0xFF0000FF</item>
+        <item>0xFFFF00FF</item>
+        <item>0xFF000055</item>
+        <item>0xFF0000AA</item>
+        <item>0xFF005500</item>
+        <item>0xFF005555</item>
+        <item>0xFF0055AA</item>
+        <item>0xFF0055FF</item>
+        <item>0xFF00AA00</item>
+        <item>0xFF00AA55</item>
+        <item>0xFF00AAAA</item>
+        <item>0xFF00AAFF</item>
+        <item>0xFF00FF55</item>
+        <item>0xFF00FFAA</item>
+        <item>0xFF550000</item>
+        <item>0xFF550055</item>
+        <item>0xFF5500AA</item>
+        <item>0xFF5500FF</item>
+        <item>0xFF555500</item>
+        <item>0xFF555555</item>
+        <item>0xFF5555AA</item>
+        <item>0xFF5555FF</item>
+        <item>0xFF55AA00</item>
+        <item>0xFF55AA55</item>
+        <item>0xFF55AAAA</item>
+        <item>0xFF55AAFF</item>
+        <item>0xFF55FF00</item>
+        <item>0xFF55FF55</item>
+        <item>0xFF55FFAA</item>
+        <item>0xFF55FFFF</item>
+        <item>0xFFAA0000</item>
+        <item>0xFFAA0055</item>
+        <item>0xFFAA00AA</item>
+        <item>0xFFAA00FF</item>
+        <item>0xFFAA5500</item>
+        <item>0xFFAA5555</item>
+        <item>0xFFAA55AA</item>
+        <item>0xFFAA55FF</item>
+        <item>0xFFAAAA00</item>
+        <item>0xFFAAAA55</item>
+        <item>0xFFAAAAAA</item>
+        <item>0xFFAAAAFF</item>
+        <item>0xFFAAFF00</item>
+        <item>0xFFAAFF55</item>
+        <item>0xFFAAFFAA</item>
+        <item>0xFFAAFFFF</item>
+        <item>0xFFFF0055</item>
+        <item>0xFFFF00AA</item>
+        <item>0xFFFF5500</item>
+        <item>0xFFFF5555</item>
+        <item>0xFFFF55AA</item>
+        <item>0xFFFF55FF</item>
+        <item>0xFFFFAA00</item>
+        <item>0xFFFFAA55</item>
+        <item>0xFFFFAAAA</item>
+        <item>0xFFFFAAFF</item>
+        <item>0xFFFFFF55</item>
+        <item>0xFFFFFFAA</item>
+    </integer-array>
+
+    <!-- Titles for captioning opacity preference. [CHAR LIMIT=35] -->
+    <string-array name="captioning_opacity_selector_titles" >
+        <item>25%</item>
+        <item>50%</item>
+        <item>75%</item>
+        <item>100%</item>
+    </string-array>
+
+    <!-- Values for captioning opacity preference. -->
+    <integer-array name="captioning_opacity_selector_values" translatable="false" >
+        <item>0x40FFFFFF</item>
+        <item>0x80FFFFFF</item>
+        <item>0xC0FFFFFF</item>
+        <item>0xFFFFFFFF</item>
+    </integer-array>
+
+    <!-- Titles for captioning text style preset preference. [CHAR LIMIT=35] -->
+    <string-array name="captioning_preset_selector_titles" >
+        <item>White on black</item>
+        <item>Black on white</item>
+        <item>Yellow on black</item>
+        <item>Yellow on blue</item>
+        <item>Custom</item>
+    </string-array>
+
+    <!-- Values for captioning text style preset preference. -->
+    <integer-array name="captioning_preset_selector_values" translatable="false" >
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>-1</item>
+    </integer-array>
+
+    <!-- Titles for runtime selection preference. [CHAR LIMIT=35] -->
+    <string-array name="select_runtime_titles">
+        <item>Dalvik</item>
+        <item>ART</item>
+        <item>ART (debug)</item>
+    </string-array>
+
+    <!-- Values for runtime selection preference. -->
+    <string-array name="select_runtime_values" translatable="false" >
+        <item>libdvm.so</item>
+        <item>libart.so</item>
+        <item>libartd.so</item>
+    </string-array>
+
+    <!-- Summaries for runtime selection preference. [CHAR LIMIT=100]-->
+    <string-array name="select_runtime_summaries" >
+        <item>Use Dalvik</item>
+        <item>Use ART</item>
+        <item>Use ART debug build</item>
+    </string-array>
+
     <!-- Titles for HDCP checking preference. [CHAR LIMIT=35] -->
     <string-array name="hdcp_checking_titles">
         <item>Never check</item>
@@ -770,8 +982,11 @@
     <string-array name="overlay_display_devices_entries">
         <item>None</item>
         <item>720x480 mdpi</item>
+        <item>720x480 mdpi (secure)</item>
         <item>1280x720 tvdpi</item>
+        <item>1280x720 tvdpi (secure)</item>
         <item>1920x1080 xhdpi</item>
+        <item>1920x1080 xhdpi (secure)</item>
         <item>1280x720 tvdpi and 1920x1080 xhdpi</item>
     </string-array>
 
@@ -779,8 +994,11 @@
     <string-array name="overlay_display_devices_values" translatable="false" >
         <item></item>
         <item>720x480/160</item>
+        <item>720x480/160,secure</item>
         <item>1280x720/213</item>
+        <item>1280x720/213,secure</item>
         <item>1920x1080/320</item>
+        <item>1920x1080/320,secure</item>
         <item>1280x720/213;1920x1080/320</item>
     </string-array>
 
@@ -830,6 +1048,22 @@
         <item>true</item>
     </string-array>
 
+    <!-- Titles for debug overdraw preference. [CHAR LIMIT=50] -->
+    <string-array name="debug_hw_overdraw_entries">
+        <item>Off</item>
+        <item>Show overdraw areas</item>
+        <item>Show areas for Deuteranomaly</item>
+        <item>Show overdraw counter</item>
+    </string-array>
+
+    <!-- Values for debug overdraw preference. -->
+    <string-array name="debug_hw_overdraw_values" translatable="false" >
+        <item>false</item>
+        <item>show</item>
+        <item>show_deuteranomaly</item>
+        <item>count</item>
+    </string-array>
+
     <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
     <string-array name="app_process_limit_entries">
         <item>Standard limit</item>
@@ -916,4 +1150,17 @@
         <!-- Always allow app to send to premium SMS short code. -->
         <item>Always allow</item>
     </string-array>
+
+    <!-- [CHAR LIMIT=30] Labels for memory states -->
+    <string-array name="ram_states">
+        <!-- Normal desired memory state. -->
+        <item>normal</item>
+        <!-- Moderate memory state, not as good as normal. -->
+        <item>moderate</item>
+        <!-- Memory is running low. -->
+        <item>low</item>
+        <!-- Memory is critical. -->
+        <item>critical</item>
+    </string-array>
+
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 684811cf6b7..fd28fa000d0 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -81,4 +81,6 @@
         <attr name="fillColor" format="color" />
         <attr name="fillColorSecondary" format="color" />
     </declare-styleable>
+
+    <attr name="apnPreferenceStyle" format="reference" />
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index bd385f6a75b..40098f5dc75 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -35,7 +35,8 @@
 
     <color name="divider_color">#20ffffff</color>
     <color name="title_color">@android:color/holo_blue_light</color>
-    <color name="setup_divider_color">#333333</color>
+    <color name="setup_divider_color_dark">#33ffffff</color>
+    <color name="setup_divider_color_light">#33000000</color>
 
     <color name="circle_avatar_frame_color">#ffffffff</color>
     <color name="circle_avatar_frame_shadow_color">#80000000</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index aa4009668e7..bf697d63452 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -39,13 +39,14 @@
     <item type="dimen" name="setup_title_height">15%</item>
     <item type="dimen" name="setup_border_width">5%</item>
     <dimen name="setup_margin_bottom">0dip</dimen>
-    <dimen name="setup_title_size">25sp</dimen>
+    <dimen name="setup_title_size">25dp</dimen>
     <dimen name="setup_button_size">32dip</dimen>
     <dimen name="setup_item_margin">16dip</dimen>
 
     <dimen name="divider_height">3dip</dimen>
     <dimen name="divider_margin_top">6dip</dimen>
     <dimen name="divider_margin_bottom">7dip</dimen>
+    <dimen name="vert_divider_width">1dip</dimen>
 
     <!--  Size of icons in the top-level of settings  -->
     <dimen name="header_icon_width">28dp</dimen>
@@ -69,4 +70,7 @@
     <!-- Minimum width for the popup for updating a user's photo. -->
     <dimen name="update_user_photo_popup_min_width">300dip</dimen>
 
+    <dimen name="captioning_preview_height">200dp</dimen>
+
+    <dimen name="settings_side_margin">@*android:dimen/preference_fragment_padding_side</dimen>
 </resources>
diff --git a/res/values/donottranslate.xml b/res/values/donottranslate.xml
index ba4ff2ef9d0..e6bd9a6bb7b 100644
--- a/res/values/donottranslate.xml
+++ b/res/values/donottranslate.xml
@@ -33,5 +33,4 @@
         <item>@string/input_method_selector_always_show_value</item>
         <item>@string/input_method_selector_always_hide_value</item>
     </string-array>
-
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 091c6b3f246..e6b88646aff 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -276,6 +276,8 @@
     <string name="bluetooth_connected_no_headset">Connected (no phone)</string>
     <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
     <string name="bluetooth_connected_no_a2dp">Connected (no media)</string>
+    <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+    <string name="bluetooth_connected_no_map">Connected (no message access)</string>
     <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
     <string name="bluetooth_connected_no_headset_no_a2dp">Connected (no phone or media)</string>
     <!-- Bluetooth settings.  Message when a device is disconnected -->
@@ -349,14 +351,25 @@
     <string name="bluetooth_connection_dialog_text">"Do you want to connect to \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022?"</string>
 
     <!-- Activity label of BluetoothPbPermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
-    <string name="bluetooth_phonebook_request">"Phone book request"</string>
+    <string name="bluetooth_phonebook_request">"Phone book access request"</string>
 
     <!-- Bluetooth phone book permission Alert Activity text [CHAR LIMIT=none] -->
     <string name="bluetooth_pb_acceptance_dialog_text">%1$s wants to access your contacts and call history. Give access to %2$s?</string>
 
     <!-- Bluetooth phone book permission Alert Activity checkbox text [CHAR LIMIT=none] -->
+    <string name="bluetooth_remember_choice">Don\'t ask again</string>
+    <!--FIXME SHOULD BE REMOVED AND ALL LANG VERSIONS FIXED TO ABOVE NAME -->
     <string name="bluetooth_pb_remember_choice">Don\'t ask again</string>
 
+    <!-- Activity label of BluetoothMessagePermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+    <string name="bluetooth_map_request">"Message access request"</string>
+
+    <!-- Bluetooth message permission Alert Activity text [CHAR LIMIT=none] -->
+    <string name="bluetooth_map_acceptance_dialog_text">%1$s wants to access your messages. Give access to %2$s?</string>
+
+
+
+
     <!-- Date & time settings screen title -->
     <string name="date_and_time">Date &amp; time settings</string>
     <!-- The title of the activity to pick a time zone. -->
@@ -387,7 +400,7 @@
     <string name="intent_sender_account_label">Account: </string>
 
     <!-- HTTP proxy settings title -->
-    <string name="proxy_settings_title">Proxy settings</string>
+    <string name="proxy_settings_title">Proxy</string>
     <!-- HTTP proxy settings. Button to clear the proxy box. -->
     <string name="proxy_clear_text">Clear</string>
     <!-- HTTP proxy settings. The port number label. -->
@@ -671,6 +684,10 @@
     <string name="show_owner_info_on_lockscreen_label">Show owner info on lock screen</string>
     <!-- Text shown for title of owner info setting [CHAR LIMIT=20]-->
     <string name="owner_info_settings_title">Owner info</string>
+    <!-- Text shown for title of settings checkbox to enable widgets [CHAR LIMIT=20]-->
+    <string name="security_enable_widgets_title">Enable widgets</string>
+    <!-- Summary for settings checkbox to disable widgets when the setting has been disabled by an installed device admin [CHAR LIMIT=50] -->
+    <string name="security_enable_widgets_disabled_summary">Disabled by administrator</string>
     <!-- Text shown for summary of owner info setting [CHAR LIMIT=40]-->
     <string name="owner_info_settings_summary"></string>
     <!-- Hint text shown in owner info edit text [CHAR LIMIT=50] -->
@@ -684,7 +701,7 @@
     <!-- Text shown for title of profile info setting [CHAR LIMIT=20]-->
     <string name="profile_info_settings_title">Profile info</string>
     <!-- Main Settings screen setting option title for the item to take you to the location screen -->
-    <string name="location_settings_title">Location access</string>
+    <string name="location_settings_title">Location</string>
     <!-- Main Settings screen setting option title for the item to take you to the security screen -->
     <string name="security_settings_title">Security</string>
     <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
@@ -1012,7 +1029,7 @@
     <!-- Summary for a warning message about security implications of enabling a notification
           listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
     <string name="notification_listener_security_warning_summary">
-        <xliff:g id="notification_listener_name">%1$s</xliff:g> will be able to 
+        <xliff:g id="notification_listener_name">%1$s</xliff:g> will be able to
         read all notifications posted by the system or any installed app, which may include personal
         information such as contact names and the text of messages sent to you. It will also be able
         to dismiss these notifications or touch action buttons within them.
@@ -1132,6 +1149,8 @@
     <string name="bluetooth_profile_pan">Internet access</string>
     <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40]-->
     <string name="bluetooth_profile_pan_nap">Internet connection sharing</string>
+    <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the map profile. -->
+    <string name="bluetooth_profile_map">Message Access</string>
 
     <!-- Bluetooth settings.  Message for disconnecting from the A2DP profile. [CHAR LIMIT=80] -->
     <string name="bluetooth_disconnect_a2dp_profile"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from media audio.</string>
@@ -1164,6 +1183,8 @@
     <string name="bluetooth_headset_profile_summary_connected">Connected to phone audio</string>
     <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
     <string name="bluetooth_opp_profile_summary_connected">Connected to file transfer server</string>
+    <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+    <string name="bluetooth_map_profile_summary_connected">Connected to map</string>
     <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
     <string name="bluetooth_opp_profile_summary_not_connected">Not connected to file transfer server</string>
     <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
@@ -1187,6 +1208,8 @@
          for the PAN checkbox preference that describes how checking it
          will set the PAN profile as preferred. -->
     <string name="bluetooth_pan_profile_summary_use_for">Use for Internet access</string>
+    <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+    <string name="bluetooth_map_profile_summary_use_for">Use for map</string>
 
     <!-- Bluetooth settings.  Dock Setting Title -->
     <string name="bluetooth_dock_settings">Dock Settings</string>
@@ -1221,6 +1244,8 @@
     <string name="wifi_display_status_connected">Connected</string>
     <!-- Wifi Display settings. The status summary for available devices. [CHAR LIMIT=40] -->
     <string name="wifi_display_status_available">Available</string>
+    <!-- Wifi Display settings. The status summary for devices that's already in use. [CHAR LIMIT=40] -->
+    <string name="wifi_display_status_in_use">In use</string>
     <!-- Wifi Display settings. Image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
     <string name="wifi_display_details">Display settings</string>
 
@@ -1245,6 +1270,25 @@
     <!-- Wifi Display settings. Summary shown in Display settings. Text used for 'Disabled' state. [CHAR LIMIT=40] -->
     <string name="wifi_display_summary_disabled">Disabled</string>
 
+    <!-- Wifi Display settings. The sub heading for wireless display certification options. [CHAR LIMIT=40] -->
+    <string name="wifi_display_certification_heading" translatable="false">Certification</string>
+    <!-- Wifi Display settings. The section title for wireless display session info. [CHAR LIMIT=40] -->
+    <string name="wifi_display_session_info" translatable="false">Session info</string>
+    <!-- Wifi Display settings. The checkbox title for enabling listen mode during certification process. [CHAR LIMIT=40] -->
+    <string name="wifi_display_listen_mode" translatable="false">Enable listen mode</string>
+    <!-- Wifi Display settings. The checkbox title for enabling autonomous GO during certification process. [CHAR LIMIT=40] -->
+    <string name="wifi_display_autonomous_go" translatable="false">Enable autonomous GO</string>
+    <!-- Wifi Display settings. The button text for sending pause trigger during certification process. [CHAR LIMIT=40] -->
+    <string name="wifi_display_pause" translatable="false">Pause</string>
+    <!-- Wifi Display settings. The button text for sending play (resume) trigger during certification process. [CHAR LIMIT=40] -->
+    <string name="wifi_display_resume" translatable="false">Resume</string>
+    <!-- Wifi Display settings. The dropdown menu title for choosing WPS configuration during certification process. [CHAR LIMIT=40] -->
+    <string name="wifi_display_wps_config" translatable="false">WPS configuration</string>
+    <!-- Wifi Display settings. The dropdown menu title for choosing listen channel during certification process. [CHAR LIMIT=40] -->
+    <string name="wifi_display_listen_channel" translatable="false">Listen channel</string>
+    <!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] -->
+    <string name="wifi_display_operating_channel" translatable="false">Operating channel</string>
+
     <!-- NFC settings -->
     <!-- Used in the 1st-level settings screen to turn on NFC -->
     <string name="nfc_quick_toggle_title">NFC</string>
@@ -1696,6 +1740,7 @@
     <!-- Sound and alerts settings -->
     <skip/>
     <!-- Main Settings screen setting option name to go into the display settings screen -->
+    <string name="home_settings">Home</string>
     <string name="display_settings_title">Display</string>
     <!-- Sound settings screen heading -->
     <string name="sound_settings">Sound</string>
@@ -2335,8 +2380,14 @@
     <!-- Wireless controls, item title to go into the network settings -->
     <string name="network_settings_title">Mobile networks</string>
 
-    <!-- Manage mobile plan [CHAR LIMIT=35]-->
-    <string name="manage_mobile_plan_title" translatable="true">Manage mobile plan</string>
+    <!-- Mobile plan [CHAR LIMIT=35]-->
+    <string name="manage_mobile_plan_title" translatable="true">Mobile plan</string>
+
+    <!-- SMS Application [CHAR LIMIT=35]-->
+    <string name="sms_application_title" translatable="true">Default SMS app</string>
+    <string name="sms_change_default_dialog_title" translatable="true">Change SMS app?</string>
+    <string name="sms_change_default_dialog_text" translatable="true">Use <xliff:g id="new_app">%s</xliff:g> instead of <xliff:g id="current_app">%s</xliff:g> as your SMS app?</string>
+    <string name="sms_change_default_no_previous_dialog_text" translatable="true">Use <xliff:g id="new_app">%s</xliff:g> as your SMS app?</string>
 
     <!-- The SIM operator is not known [CHAR_ LIMIT=50]-->
     <string name="mobile_unknown_sim_operator" translatable="true">Uknown SIM operator</string>
@@ -2352,6 +2403,38 @@
 
     <!-- Security & location settings screen, section header for settings relating to location -->
     <string name="location_title">My Location</string>
+    <!-- [CHAR LIMIT=30] Location settings screen, setting preference screen box label for location mode -->
+    <string name="location_mode_title">Mode</string>
+    <!-- [CHAR LIMIT=30] Location settings screen, high accuracy location mode -->
+    <string name="location_mode_high_accuracy_title">High accuracy</string>
+    <!-- [CHAR LIMIT=30] Location settings screen, battery saving location mode -->
+    <string name="location_mode_battery_saving_title">Battery saving</string>
+    <!-- [CHAR LIMIT=30] Location settings screen, device only location mode -->
+    <string name="location_mode_sensors_only_title">Device only</string>
+    <!-- [CHAR LIMIT=30] Location settings screen, location off mode -->
+    <string name="location_mode_location_off_title">Location off</string>
+    <!-- [CHAR LIMIT=30] Location settings screen, sub category for recent location requests -->
+    <string name="location_category_recent_location_requests">Recent location requests</string>
+    <!-- Location settings screen, displayed when there's no recent app accessing location -->
+    <string name="location_no_recent_apps">No apps have requested location recently</string>
+    <!-- [CHAR LIMIT=30] Location settings screen, sub category for location services -->
+    <string name="location_category_location_services">Location services</string>
+    <!-- [CHAR LIMIT=30] Location settings screen, recent location requests high battery use-->
+    <string name="location_high_battery_use">High battery use</string>
+    <!-- [CHAR LIMIT=30] Location settings screen, recent location requests low battery use-->
+    <string name="location_low_battery_use">Low battery use</string>
+    <!-- [CHAR LIMIT=30] Location mode screen, screen title -->
+    <string name="location_mode_screen_title">Location mode</string>
+    <!-- [CHAR LIMIT=130] Location mode screen, description for high accuracy mode -->
+    <string name="location_mode_high_accuracy_description">Use GPS, Wi\u2011Fi and mobile networks to estimate location </string>
+    <!-- [CHAR LIMIT=130] Location mode screen, description for battery saving mode -->
+    <string name="location_mode_battery_saving_description">Use Wi\u2011Fi and mobile networks to estimate location</string>
+    <!-- [CHAR LIMIT=130] Location mode screen, description for sensors only mode -->
+    <string name="location_mode_sensors_only_description">Use GPS to pinpoint your location</string>
+    <!-- [CHAR LIMIT=130] Location mode screen, temporary value to show as the status of a location
+         setting injected by an external app while the app is being queried for the actual value -->
+    <string name="location_loading_injected_setting">Retrieving…</string>
+
     <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) -->
     <string name="location_network_based">Wi\u2011Fi &amp; mobile network location</string>
     <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary for Google location service check box-->
@@ -2463,18 +2546,18 @@
     <!-- Do not translate. -->
     <string name="lockpattern_need_to_unlock_wrong_footer" />
     <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen.  This si when they are supposed to draw a new unlock pattern (for example, if they are changing their unlock patterns)..-->
-    <string name="lockpattern_recording_intro_header">Draw an unlock pattern:</string>
+    <string name="lockpattern_recording_intro_header">Draw an unlock pattern</string>
     <!-- Security & location settings screen, change unlock pattern screen hint on bottom of screen.  We are telling them to press the menu button to see more options or help. -->
     <string name="lockpattern_recording_intro_footer">Press Menu for help.</string>
     <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen while drawing pattern -->
-    <string name="lockpattern_recording_inprogress">Release finger when done.</string>
+    <string name="lockpattern_recording_inprogress">Release finger when done</string>
     <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen if user doesn't connect enough dots -->
-    <string name="lockpattern_recording_incorrect_too_short">Connect at least <xliff:g id="number">%d</xliff:g> dots. Try again:</string>
+    <string name="lockpattern_recording_incorrect_too_short">Connect at least <xliff:g id="number">%d</xliff:g> dots. Try again.</string>
     <!-- Security & location settings screen, change unlock pattern screen message on top of screen after drawing pattern -->
-    <string name="lockpattern_pattern_entered_header">Pattern recorded.</string>
+    <string name="lockpattern_pattern_entered_header">Pattern recorded</string>
     <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen to confirm pattern -->
-    <string name="lockpattern_need_to_confirm">Draw pattern again to confirm:</string>
-    <string name="lockpattern_pattern_confirmed_header">Your new unlock pattern:</string>
+    <string name="lockpattern_need_to_confirm">Draw pattern again to confirm</string>
+    <string name="lockpattern_pattern_confirmed_header">Your new unlock pattern</string>
     <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  When they are ready to draw it once again to confirm it, they press this button. -->
     <string name="lockpattern_confirm_button_text">Confirm</string>
     <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  If they are nto satisfied with this pattern, they click this button to redraw the pattern. -->
@@ -2945,13 +3028,9 @@
     <string name="keyboard_layout_picker_title">Keyboard layouts</string>
 
     <!-- User dictionary settings --><skip />
-    <!-- User dictionary settings, The titlebar text of the User dictionary settings screen. -->
-    <string name="user_dict_settings_titlebar">User dictionary</string>
-    <!-- User dictionary settings, The title of the list item to go into the User dictionary settings screen when there is only one user dictionary. [CHAR LIMIT=35] -->
-    <string name="user_dict_single_settings_title">Personal dictionary</string>
-    <!-- User dictionary settings, The title of the list item to go into the User dictionary list when there are several user dictionaries. [CHAR LIMIT=35] -->
-    <string name="user_dict_multiple_settings_title">Personal dictionaries</string>
-    <!-- User dictionary settings.  The summary of the listem item to go into the User dictionary settings screen. -->
+    <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
+    <string name="user_dict_settings_title">Personal dictionary</string>
+    <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
     <string name="user_dict_settings_summary">""</string>
     <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
     <string name="user_dict_settings_add_menu_title">Add</string>
@@ -3077,6 +3156,22 @@
     <string name="keep_screen_on">Stay awake</string>
     <!-- setting Checkbox summary whether to keep the screen on when plugged in  -->
     <string name="keep_screen_on_summary">Screen will never sleep while charging</string>
+    <!-- Setting Checkbox title whether to enable bluetooth HCI snoop log -->
+    <string name="bt_hci_snoop_log">Enable Bluetooth HCI snoop log</string>
+    <!-- setting Checkbox summary whether to capture all bluetooth HCI packets in a file -->
+    <string name="bt_hci_snoop_log_summary">Capture all bluetooth HCI packets in a file</string>
+
+    <!-- Runtime selection title, used for debug purposes only. [CHAR LIMIT=25] -->
+    <string name="select_runtime_title">Select runtime </string>
+    <!-- Runtime selection dialog title, used for debug purposes only. [CHAR LIMIT=25] -->
+    <string name="select_runtime_dialog_title">Select runtime</string>
+    <!-- Message of dialog confirming that user wants to restart their device with a new runtime -->
+    <string name="select_runtime_warning_message">Reboot to change runtime from <xliff:g id="old" example="libdvm.so">%1$s</xliff:g> to <xliff:g id="new" example="libart.so">%2$s</xliff:g>?</string>
+
+    <!-- Setting Checkbox title whether to show options for wireless display certification -->
+    <string name="wifi_display_certification">Wireless display certification</string>
+    <!-- setting Checkbox summary whether to show options for wireless display certification  -->
+    <string name="wifi_display_certification_summary">Show options for wireless display certification</string>
     <!-- Setting Checkbox title whether to allow mock locations -->
     <string name="allow_mock_location">Allow mock locations</string>
     <!-- setting Checkbox summary whether to allow mock locations  -->
@@ -3114,6 +3209,11 @@
     <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
     <string name="enforce_read_external_confirm_message" product="default">When SD card is protected, apps must request permission to read data from external storage.\n\nSome apps may not work until updated by their developers.</string>
 
+    <!-- Title of checkbox setting that enables the terminal app. [CHAR LIMIT=32] -->
+    <string name="enable_terminal_title">Local terminal</string>
+    <!-- Summary of checkbox setting that enables the terminal app. [CHAR LIMIT=64] -->
+    <string name="enable_terminal_summary">Enable terminal app that offers local shell access</string>
+
     <!-- Title for the screen that lets the user choose a gadget to add to the home screen
          (or other screens that can host gadgets).  Note to translators: we're still determining
          the final name for Gadgets/Widgets, so please translate both for now. -->
@@ -3145,6 +3245,15 @@
     <!-- Used to show an amount of time in the form "s seconds" in BatteryHistory -->
     <string name="battery_history_seconds"><xliff:g id="seconds">%1$d</xliff:g>s</string>
 
+    <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
+    <string name="battery_history_days_no_seconds"><xliff:g id="days">%1$d</xliff:g>d <xliff:g id="hours">%2$d</xliff:g>h <xliff:g id="minutes">%3$d</xliff:g>m</string>
+
+    <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
+    <string name="battery_history_hours_no_seconds"><xliff:g id="hours">%1$d</xliff:g>h <xliff:g id="minutes">%2$d</xliff:g>m</string>
+
+    <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
+    <string name="battery_history_minutes_no_seconds"><xliff:g id="minutes">%1$d</xliff:g>m</string>
+
     <!-- XXX remove? Strings used for displaying usage statistics -->
     <string name="usage_stats_label">Usage statistics</string>
 
@@ -3166,10 +3275,12 @@
     <string name="accessibility_settings">Accessibility</string>
     <!-- Settings title for accessibility settings screen -->
     <string name="accessibility_settings_title">Accessibility settings</string>
-    <!--  Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
+    <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
     <string name="accessibility_services_title">Services</string>
     <!-- Title for the accessibility preference category of system related preferences. [CHAR LIMIT=25] -->
     <string name="accessibility_system_title">System</string>
+    <!-- Title for the accessibility preference screen to enable video captioning. [CHAR LIMIT=35] -->
+    <string name="accessibility_captioning_title">Captions</string>
     <!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->
     <string name="accessibility_screen_magnification_title">Magnification gestures</string>
     <!-- Summary for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=none] -->
@@ -3202,11 +3313,66 @@
     <!-- 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 feature. [CHAR LIMIT=10] -->
+    <!-- Summary for the enabled state of an accessibility feature. [CHAR LIMIT=10] -->
     <string name="accessibility_feature_state_on">On</string>
-    <!-- Summary for the disabled state of an accessiblity feature. [CHAR LIMIT=10] -->
+    <!-- Summary for the disabled state of an accessibility feature. [CHAR LIMIT=10] -->
     <string name="accessibility_feature_state_off">Off</string>
 
+    <!-- Title for the preference category containing the video caption preview. [CHAR LIMIT=35] -->
+    <string name="captioning_preview_title">Preview</string>
+    <!-- Title for the preference catgeory containing standard video caption options. [CHAR LIMIT=35] -->
+    <string name="captioning_standard_options_title">Standard options</string>
+    <!-- Title for the preference to change video caption locale. [CHAR LIMIT=35] -->
+    <string name="captioning_locale">Language</string>
+    <!-- Title for the preference to change video caption text size. [CHAR LIMIT=35] -->
+    <string name="captioning_text_size">Text size</string>
+    <!-- Title for the preference category containing video caption property presets. [CHAR LIMIT=35] -->
+    <string name="captioning_preset">Caption style</string>
+    <!-- Title for the preference catgeory containing custom video caption properties. [CHAR LIMIT=35] -->
+    <string name="captioning_custom_options_title">Custom options</string>
+    <!-- Title for the preference to change video caption background color. [CHAR LIMIT=35] -->
+    <string name="captioning_background_color">Background color</string>
+    <!-- Title for the preference to change video caption background opacity. [CHAR LIMIT=35] -->
+    <string name="captioning_background_opacity">Background opacity</string>
+    <!-- Title for the preference to change video caption text color. [CHAR LIMIT=35] -->
+    <string name="captioning_foreground_color">Text color</string>
+    <!-- Title for the preference to change video caption edge color. [CHAR LIMIT=35] -->
+    <string name="captioning_edge_color">Edge color</string>
+    <!-- Title for the preference to change video caption edge type. [CHAR LIMIT=35] -->
+    <string name="captioning_edge_type">Edge type</string>
+    <!-- Title for the preference to change video caption font family (ex. monospace, sans-serif). [CHAR LIMIT=35] -->
+    <string name="captioning_typeface">Font family</string>
+    <!-- Sample text for previewing video caption preferences. [CHAR LIMIT=NONE] -->
+    <string name="captioning_preview_text">Captions will look like this</string>
+    <!-- Sample characters for previewing video caption preferences. [CHAR LIMIT=2] -->
+    <string name="captioning_preview_characters">Aa</string>
+
+    <!-- Label for the default device locale. [CHAR LIMIT=35] -->
+    <string name="locale_default">Default</string>
+
+    <!-- Label for no color. [CHAR LIMIT=35] -->
+    <string name="color_none">None</string>
+    <!-- Label for the color white. [CHAR LIMIT=35] -->
+    <string name="color_white">White</string>
+    <!-- Label for the color gray. [CHAR LIMIT=35] -->
+    <string name="color_gray">Gray</string>
+    <!-- Label for the color black. [CHAR LIMIT=35] -->
+    <string name="color_black">Black</string>
+    <!-- Label for the color red. [CHAR LIMIT=35] -->
+    <string name="color_red">Red</string>
+    <!-- Label for the color green. [CHAR LIMIT=35] -->
+    <string name="color_green">Green</string>
+    <!-- Label for the color blue. [CHAR LIMIT=35] -->
+    <string name="color_blue">Blue</string>
+    <!-- Label for the color cyan. [CHAR LIMIT=35] -->
+    <string name="color_cyan">Cyan</string>
+    <!-- Label for the color yellow. [CHAR LIMIT=35] -->
+    <string name="color_yellow">Yellow</string>
+    <!-- Label for the color magenta. [CHAR LIMIT=35] -->
+    <string name="color_magenta">Magenta</string>
+    <!-- Label for custom colors, formats as a HTML color. -->
+    <string name="color_custom" translatable="false">#%1$02X%2$02X%3$02X</string>
+
     <!-- Title for a warning about security implications of enabling an accessibility
          service. [CHAR LIMIT=NONE] -->
     <string name="enable_service_title">Use
@@ -3245,6 +3411,91 @@
     <!-- Accessibility settings: button for lauching settings for an accessibility service -->
     <string name="settings_button">Settings</string>
 
+     <!-- Printing settings -->
+    <skip />
+
+    <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
+    <string name="print_settings">Printing</string>
+    <!-- Title for print service settings screen [CHAR LIMIT=25] -->
+    <string name="print_settings_title">Print services</string>
+
+    <!-- Title for a warning message about security implications of enabling a print service,
+         displayed as a dialog message when the user selects to enable a print service (tablet). [CHAR LIMIT=NONE] -->
+    <string name="print_service_security_warning_title">Use
+         <xliff:g id="service" example="My Print Service">%1$s</xliff:g>?</string>
+    <!-- Summary for a warning message about security implications of enabling a print service,
+         displayed as a dialog message when the user selects to enable a print service. [CHAR LIMIT=NONE] -->
+    <string name="print_service_security_warning_summary">Your document may pass through
+        one or more servers on its way to the printer.</string>
+
+    <!-- Title for the prompt shown as a placeholder if no print serivices are installed. [CHAR LIMIT=50] -->
+    <string name="print_no_services_installed">No services installed</string>
+
+    <!-- Title for the prompt shown as a placeholder if no printers are found while searching. [CHAR LIMIT=50] -->
+    <string name="print_no_printers_found">No printers found</string>
+
+    <!-- Title for print menu item to launch a settings activity. [CHAR LIMIT=25] -->
+    <string name="print_menu_item_settings">Settings</string>
+
+    <!-- Title for print menu item to launch the add printers activity. [CHAR LIMIT=25] -->
+    <string name="print_menu_item_add_printers">Add printers</string>
+
+    <!-- Summary for the enabled state of a print feature. [CHAR LIMIT=10] -->
+    <string name="print_feature_state_on">On</string>
+    <!-- Summary for the disabled state of a print feature. [CHAR LIMIT=10] -->
+    <string name="print_feature_state_off">Off</string>
+
+    <!-- Title of the action bar button to got to Play Store to download a print service. [CHAR LIMIT=25] -->
+    <string name="print_menu_item_add_service">Add service</string>
+
+    <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+    <string name="print_menu_item_add_printer">Add printer</string>
+
+    <!-- Title for the search action bar menu item. [CHAR LIMIT=20] -->
+    <string name="print_menu_item_search">Search</string>
+
+    <!-- Title for the prompt if no printers are available and the system is searching for such. [CHAR LIMIT=50] -->
+    <string name="print_searching_for_printers">Searching for printers</string>
+
+    <!-- Title for the prompt if no printers are available because the print service is disabled. [CHAR LIMIT=50] -->
+    <string name="print_service_disabled">Service disabled</string>
+
+    <!-- Title for the menu item to open the print jobs screen. [CHAR LIMIT=25] -->
+    <string name="print_print_jobs">Print jobs</string>
+
+    <!-- Title for the print job settings screen. [CHAR LIMIT=25] -->
+    <string name="print_print_job">Print job</string>
+
+    <!-- Title for the button to restart a print job. [CHAR LIMIT=25] -->
+    <string name="print_restart">Restart</string>
+
+    <!-- Title for the button to cancel a print job. [CHAR LIMIT=25] -->
+    <string name="print_cancel">Cancel</string>
+
+    <!-- Template for the summary of a print job. [CHAR LIMIT=25] -->
+    <string name="print_job_summary"><xliff:g id="printer">%1$s</xliff:g>\n<xliff:g id="time">%2$s</xliff:g></string>
+
+    <!-- Template for the label of the state for a ongoing print job. [CHAR LIMIT=25] -->
+    <string name="print_printing_state_title_template">Printing <xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g></string>
+
+    <!-- Template for the label of the state for a failed print job. [CHAR LIMIT=25] -->
+    <string name="print_failed_state_title_template">Printer error <xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g></string>
+
+    <!-- Template for the label of the state for a blocked print job. [CHAR LIMIT=25] -->
+    <string name="print_blocked_state_title_template">Printer blocked <xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g></string>
+
+    <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
+    <string name="print_search_box_shown_utterance">Search box shown</string>
+
+    <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
+    <string name="print_search_box_hidden_utterance">Search box hidden</string>
+
+    <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+    <plurals name="print_search_result_count_utterance">
+        <item quantity="one"><xliff:g id="count" example="1">%1$s</xliff:g> printer found</item>
+        <item quantity="other"><xliff:g id="count" example="2">%1$s</xliff:g> printers found</item>
+    </plurals>
+
     <!-- App Fuel Gauge strings -->
     <skip />
 
@@ -3329,10 +3580,14 @@
     <string name="usage_type_phone" product="tablet">Tablet</string>
     <!-- Label for Phone usage time -->
     <string name="usage_type_phone" product="default">Phone</string>
-    <!-- Label for Data sent -->
-    <string name="usage_type_data_send">Data sent</string>
-    <!-- Label for Data received -->
-    <string name="usage_type_data_recv">Data received</string>
+    <!-- Label for mobile network data sent [CHAR LIMIT=32] -->
+    <string name="usage_type_data_send">Mobile data sent</string>
+    <!-- Label for mobile network data received [CHAR LIMIT=32] -->
+    <string name="usage_type_data_recv">Mobile data received</string>
+    <!-- Label for Wi-Fi network data sent [CHAR LIMIT=32] -->
+    <string name="usage_type_data_wifi_send">Wi\u2011Fi data sent</string>
+    <!-- Label for Wi-Fi network data received [CHAR LIMIT=32] -->
+    <string name="usage_type_data_wifi_recv">Wi\u2011Fi data received</string>
     <!-- Label for Audio usage time -->
     <string name="usage_type_audio">Audio</string>
     <!-- Label for Video usage time -->
@@ -3389,7 +3644,7 @@
     <!-- Suggestion for exploring application info to stop or uninstall -->
     <string name="battery_sugg_apps_info">Stop or uninstall the app</string>
     <!-- [CHAR LIMIT=100] Suggestion for getting apps to consume less power due to GPS-->
-    <string name="battery_sugg_apps_gps">"Manually control GPS to prevent app from using it"</string>
+    <string name="battery_sugg_apps_gps">Select battery-saving mode</string>
     <!-- Suggestion for getting apps to consume less power -->
     <string name="battery_sugg_apps_settings">The app may offer settings to reduce battery use</string>
 
@@ -3410,6 +3665,59 @@
     <!-- Label for mediaserver process -->
     <string name="process_mediaserver_label">Mediaserver</string>
 
+    <!-- Process Stats strings -->
+    <skip />
+
+    <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
+    <string name="process_stats_summary_title">Process Stats</string>
+    <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
+    <string name="process_stats_summary">Geeky stats about running processes</string>
+    <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
+    <string name="app_memory_use">Memory use</string>
+    <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over -->
+    <string name="process_stats_total_duration"><xliff:g id="type">%1$s</xliff:g> apps over
+        <xliff:g id="time">%2$s</xliff:g></string>
+    <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+    <string name="process_stats_type_background">Background</string>
+    <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+    <string name="process_stats_type_foreground">Foreground</string>
+    <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+    <string name="process_stats_type_cached">Cached</string>
+    <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over -->
+    <string name="process_stats_memory_status">Device memory is currently
+        <xliff:g id="memstate">%1$s</xliff:g></string>
+    <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
+    <string name="process_stats_avg_ram_use">Average RAM use</string>
+    <!-- [CHAR LIMIT=NONE] Label for item showing details of maximum RAM use -->
+    <string name="process_stats_max_ram_use">Maximum RAM use</string>
+    <!-- [CHAR LIMIT=NONE] Label for item showing percent of time spent running -->
+    <string name="process_stats_run_time">Run time</string>
+    <!-- [CHAR LIMIT=NONE] Subtitle for process stats services list -->
+    <string name="services_subtitle">Services</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to select duration of stats to show -->
+    <string name="menu_proc_stats_duration">Duration</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+    <string name="menu_duration_3h">3 hours</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+    <string name="menu_duration_6h">6 hours</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+    <string name="menu_duration_12h">12 hours</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+    <string name="menu_duration_1d">1 day</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether system processes are shown -->
+    <string name="menu_show_system">Show system</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether computation should be based
+        on Uss (Unique Set Size) instead of Pss (Proportional Set Size) -->
+    <string name="menu_use_uss">Use Uss</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to select which type of stats to show -->
+    <string name="menu_proc_stats_type">Stats type</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on background processes -->
+    <string name="menu_proc_stats_type_background">Background</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
+    <string name="menu_proc_stats_type_foreground">Foreground</string>
+    <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
+    <string name="menu_proc_stats_type_cached">Cached</string>
+
     <!-- Voice input/output settings --><skip />
     <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
     <string name="voice_input_output_settings">Voice input &amp; output</string>
@@ -3452,8 +3760,11 @@
     <string name="tts_default_pitch_title">Pitch</string>
     <!-- On main TTS Settings screen, summary for default pitch for synthesized voice -->
     <string name="tts_default_pitch_summary">Affects the tone of the spoken text</string>
+
     <!-- On main TTS Settings screen, in default settings section, setting default language for synthesized voice -->
     <string name="tts_default_lang_title">Language</string>
+    <!-- On main TTS Settings screen, language summary if it can't default to system language [CHAR LIMIT=50] -->
+    <string name="tts_lang_not_selected">Language not selected</string>
     <!-- On main TTS Settings screen, summary for default language for synthesized voice -->
     <string name="tts_default_lang_summary">Sets the language-specific voice for the spoken text</string>
     <!-- On main TTS Settings screen, triggers playback of an example of speech synthesis -->
@@ -3483,6 +3794,23 @@
     <!-- Warning message about required internet conectivity for TTS synthesis, displayed as a dialog
          message when the user selects to play an example for network only locale and there's no internet connectivity. -->
     <string name="tts_engine_network_required">This language requires a working network connection for text-to-speech output.</string>
+    <!-- Text spoken by the TTS engine as an example if the engine doesn't provide sample text [CHAR LIMIT=100] -->
+    <string name="tts_default_sample_string">This is an example of speech synthesis</string>
+    <!-- On main TTS Settings screen, title of a field explaining current TTS engine status for
+	 current default language [CHAR LIMIT=50] -->
+    <string name="tts_status_title">Default language status</string>
+    <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is fully supported by the engine [CHAR LIMIT=150]-->
+    <string name="tts_status_ok"><xliff:g id="locale" example="English (United States)">%1$s</xliff:g> is fully supported</string>
+    <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is supported by the engine only if there's a working network connection [CHAR LIMIT=150] -->
+    <string name="tts_status_requires_network"><xliff:g id="locale" example="English (United States)">%1$s</xliff:g> requires network connection</string>
+    <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is not supported by the engine [CHAR LIMIT=150] -->
+    <string name="tts_status_not_supported"><xliff:g id="locale" example="English (United States)">%1$s</xliff:g> is not supported</string>
+    <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+	 tts engine is queried for status [CHAR LIMIT=150] -->
+    <string name="tts_status_checking">Checking...</string>
     <!-- On main TTS Settings screen, text for divider under which all TTS engines are listed -->
     <string name="tts_engines_section">Engines</string>
     <!-- On main TTS Settings screen, text preceded by the TTS engine name, clicking this button will launch the engine settings -->
@@ -3543,8 +3871,8 @@
     <string name="gadget_wifi">Wi\u2011Fi</string>
     <!-- Spoken description for the Bluetooth power control gadget. -->
     <string name="gadget_bluetooth">Bluetooth</string>
-    <!-- Spoken description for the GPS power control gadget. -->
-    <string name="gadget_gps">GPS</string>
+    <!-- Spoken description for the Location power control gadget. -->
+    <string name="gadget_location">Location</string>
     <!-- Spoken description for the data synchronization gadget. -->
     <string name="gadget_sync">Sync</string>
     <!-- Template for brightness gadget toggle button description. -->
@@ -3899,8 +4227,7 @@
     <!-- Messaage shown in dialog when you can't manually sync -->
     <string name="cant_sync_dialog_message">Sync for this item is currently disabled. To change this setting, temporarily turn on background data and automatic sync.</string>
 
-    <string name="wimax_settings">4G settings</string>
-    <string name="wimax_settings_summary">Set up &amp; manage 4G network and modem</string>
+    <string name="wimax_settings">4G</string>
     <string name="status_wimax_mac_address">4G MAC address</string>
     <!-- This is displayed to the user when the device needs to be decrypted -->
     <string name="enter_password">Type password to decrypt storage</string>
@@ -3989,9 +4316,7 @@
     <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>
+    <string name="debug_hw_overdraw">Debug GPU overdraw</string>
 
     <!-- UI debug setting: disable use of overlays? [CHAR LIMIT=25] -->
     <string name="disable_overlays">Disable HW overlays</string>
@@ -4006,6 +4331,11 @@
     <!-- UI debug setting: show layout bounds information summary [CHAR LIMIT=50] -->
     <string name="debug_layout_summary">Show clip bounds, margins, etc.</string>
 
+    <!-- UI debug setting: force right to left layout [CHAR LIMIT=37] -->
+    <string name="force_rtl_layout_all_locales">Force RTL layout direction</string>
+    <!-- UI debug setting: force right to left layout summary [CHAR LIMIT=100] -->
+    <string name="force_rtl_layout_all_locales_summary">Force screen layout direction to RTL for all locales</string>
+
     <!-- UI debug setting: show how CPU is being used? [CHAR LIMIT=25] -->
     <string name="show_cpu_usage">Show CPU usage</string>
     <!-- UI debug setting: show cpu usage summary [CHAR LIMIT=50] -->
@@ -4057,11 +4387,6 @@
     <string name="show_all_anrs_summary">Show App Not Responding dialog
         for background apps</string>
 
-    <!-- UI debug setting: use experimental WebView [CHAR LIMIT=25] -->
-    <string name="experimental_webview">Use Experimental WebView</string>
-    <!-- UI debug setting: use experimental WebView summary [CHAR LIMIT=50] -->
-    <string name="experimental_webview_summary">Apps will use the newest (beta) WebView</string>
-
     <!-- Activity title for network data usage summary. [CHAR LIMIT=25] -->
     <string name="data_usage_summary_title">Data usage</string>
     <!-- Title for option to pick visible time range from a list available usage periods. [CHAR LIMIT=25] -->
@@ -4337,6 +4662,22 @@
     <string name="selinux_status_permissive">Permissive</string>
     <string name="selinux_status_enforcing">Enforcing</string>
 
+    <!-- Notification of installed CA Certs --> <skip/>
+
+    <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+    <string name="ssl_ca_cert_warning">Network may be monitored</string>
+    <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
+    <string name="done_button">Done</string>
+    <!-- Title of Dialog warning users of SSL monitoring. [CHAR LIMIT=NONE] -->
+    <string name="ssl_ca_cert_dialog_title">Network monitoring</string>
+    <!-- Text of message to show to users whose administrator has installed a SSL CA Cert.  [CHAR LIMIT=NONE] -->
+    <string name="ssl_ca_cert_info_message">This device is managed by:\n<xliff:g id="managing_domain">%s</xliff:g>\n\nYour administrator is capable of monitoring your network activity, including emails, apps, and secure websites.\n\nFor more information, contact your administrator.</string>
+    <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
+    <string name="ssl_ca_cert_warning_message">A third party is capable of monitoring your network\nactivity, including emails, apps, and secure websites.\n\nA trusted credential installed on your device is making this possible.</string>
+    <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
+    <string name="ssl_ca_cert_settings_button">Check trusted credentials</string>
+
     <!-- User settings -->
     <skip/>
 
@@ -4433,6 +4774,11 @@
     <!-- Applicaitons with restrictions - settings button [CHAR LIMIT=30] -->
     <string name="apps_with_restrictions_settings_button">Expand settings for application</string>
 
+    <!-- Home application selection - uninstall button [CHAR LIMIT=80] -->
+    <string name="home_app_uninstall_button">Uninstall this application</string>
+    <!-- Message to user that Home Settings will be hidden because there is now only one available home application -->
+    <string name="only_one_home_message">Home settings will be hidden until you install another home application.</string>
+
     <!-- Warning message when changing a global setting for a tablet.[CHAR LIMIT=none] -->
     <string name="global_change_warning" product="tablet">This setting affects all users on this tablet.</string>
     <!-- Warning message when changing a global setting for a phone.[CHAR LIMIT=none] -->
@@ -4442,6 +4788,28 @@
     <!-- Warning message title for global font change [CHAR LIMIT=40] -->
     <string name="global_font_change_title">Change font size</string>
 
+    <!-- NFC payment settings --><skip/>
+    <string name="nfc_payment_settings_title">Tap &amp; pay</string>
+    <!-- String shown when there are no NFC payment applications installed -->
+    <string name="nfc_payment_no_apps">Pay with just a tap</string>
+    <!-- String shown when there are no NFC payment applications installed, clickable, pointing to
+         a website to learn more-->
+    <string name="nfc_payment_learn_more">Learn more</string>
+    <string name="nfc_payment_menu_item_add_service">Find apps</string>
+    <!-- Label for the dialog that is shown when the user is asked to set a
+         preferred payment application -->
+    <string name="nfc_payment_set_default_label">Set as your preference?</string>
+    <string name="nfc_payment_set_default">Always use <xliff:g id="app">%1$s</xliff:g> when you tap &amp; pay?</string>
+    <string name="nfc_payment_set_default_instead_of">Always use <xliff:g id="app">%1$s</xliff:g> instead of <xliff:g id="app">%2$s</xliff:g> when you tap &amp; pay?</string>
+    <!-- Restrictions settings --><skip/>
+
+    <!-- Restriction settings title [CHAR LIMIT=35] -->
+    <string name="restriction_settings_title">Restrictions</string>
+    <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
+    <string name="restriction_menu_reset">Remove restrictions</string>
+    <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
+    <string name="restriction_menu_change_pin">Change PIN</string>
+
     <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
     <string name="app_notifications_switch_label">Show notifications</string>
 
@@ -4478,6 +4846,8 @@
     <string name="help_url_location_access" translatable="false"></string>
     <!-- Help URL, Security settings [DO NOT TRANSLATE] -->
     <string name="help_url_security" translatable="false"></string>
+    <!-- Help URL, Tap & pay [DO NOT TRANSLATE] -->
+    <string name="help_url_nfc_payment" translatable="false"></string>
 
     <!-- User account title [CHAR LIMIT=30] -->
     <string name="user_account_title">Account for content</string>
@@ -4486,8 +4856,6 @@
 
     <!-- Cell Broadcast settings title [CHAR LIMIT=50] -->
     <string name="cell_broadcast_settings">Cell broadcasts</string>
-    <!-- Cell Broadcast settings description [CHAR LIMIT=100] -->
-    <string name="cell_broadcast_settings_summary">Select the types of emergency alerts to display.</string>
 
     <!-- User app limits screen title [CHAR LIMIT=35] -->
     <string name="user_restrictions_title">Application and content restrictions</string>
@@ -4517,7 +4885,7 @@
     <!-- Restrictions summary for allowing NFC transfers (phone) [CHAR LIMIT=100] -->
     <string name="restriction_nfc_enable_summary" product="default">Allow data exchange when the phone touches another device</string>
     <!-- Restrictions title for allowing location sharing [CHAR LIMIT=35] -->
-    <string name="restriction_location_enable_title">Location access</string>
+    <string name="restriction_location_enable_title">Location</string>
     <!-- Restrictions summary for allowing location sharing [CHAR LIMIT=100] -->
     <string name="restriction_location_enable_summary" >Let apps use your location information</string>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ebd87221ed2..eee2cd97ae5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -82,9 +82,47 @@
     <style name="Theme.CreateShortCut" parent="android:Theme.Holo.DialogWhenLarge">
     </style>
 
-    <style name="setup_wizard_theme" parent="android:Theme.Holo.NoActionBar">
-        <item name="android:windowSoftInputMode">adjustPan</item>
-        <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
+    <style name="PreferenceHeaderPanelSinglePane">
+        <item name="android:layout_marginStart">0dp</item>
+        <item name="android:layout_marginEnd">0dp</item>
+        <item name="android:background">@null</item>
+    </style>
+
+    <style name="PreferencePanelSinglePane" parent="@*android:style/PreferencePanel">
+        <item name="android:layout_marginStart">0dp</item>
+        <item name="android:layout_marginEnd">0dp</item>
+        <item name="android:paddingStart">0dp</item>
+        <item name="android:paddingEnd">0dp</item>
+        <item name="android:background">@null</item>
+        <item name="android:scrollbarStyle">outsideOverlay</item>
+    </style>
+
+    <style name="PreferenceHeaderListSinglePane" parent="@*android:style/PreferenceHeaderList">
+        <item name="android:paddingStart">@dimen/settings_side_margin</item>
+        <item name="android:paddingEnd">@dimen/settings_side_margin</item>
+        <item name="android:paddingTop">0dp</item>
+        <item name="android:paddingBottom">0dp</item>
+        <item name="android:layout_marginStart">0dp</item>
+        <item name="android:layout_marginEnd">0dp</item>
+        <item name="android:layout_marginTop">0dp</item>
+        <item name="android:layout_marginBottom">0dp</item>
+        <item name="android:scrollbarStyle">outsideOverlay</item>
+    </style>
+
+    <style name="PreferenceFragmentListSinglePane" parent="@*android:style/PreferenceFragmentList">
+        <item name="android:paddingStart">@dimen/settings_side_margin</item>
+        <item name="android:paddingEnd">@dimen/settings_side_margin</item>
+        <item name="android:layout_marginStart">0dp</item>
+        <item name="android:layout_marginEnd">0dp</item>
+        <item name="android:scrollbarStyle">outsideOverlay</item>
+    </style>
+
+    <style name="VertDivider">
+        <item name="android:layout_width">@dimen/vert_divider_width</item>
+        <item name="android:layout_height">fill_parent</item>
+        <item name="android:background">@color/divider_color</item>
+        <item name="android:focusable">false</item>
+        <item name="android:clickable">false</item>
     </style>
 
     <!-- We'd like to have this as 16dip hight including paddingTop/paddingBottom to
@@ -92,7 +130,7 @@
     <style name="TopDivider">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">@dimen/divider_height</item>
-        <item name="android:background">@color/setup_divider_color</item>
+        <item name="android:background">?attr/setup_divider_color</item>
         <item name="android:focusable">false</item>
         <item name="android:clickable">false</item>
         <item name="android:layout_marginTop">@dimen/divider_margin_top</item>
@@ -203,4 +241,11 @@
     <style name="KeyguardAppWidgetItem">
         <item name="android:textSize">18sp</item>
     </style>
+
+    <!-- Scrollbar style OUTSIDE_OVERLAY -->
+    <integer name="preference_scrollbar_style">33554432</integer>
+
+    <style name="ApnPreference">
+        <item name="android:layout">@layout/apn_preference_layout</item>
+    </style>
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index b5f8f6404a8..a87ad33febf 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -15,8 +15,61 @@
 -->
 
 <resources>
+    <attr name="ic_menu_add" format="reference" />
+    <attr name="ic_menu_moreoverflow" format="reference" />
+    <attr name="ic_wps" format="reference" />
+    <attr name="setup_divider_color" format="reference" />
+    <attr name="wifi_signal" format="reference" />
+
+    <style name="SetupWizardWifiTheme" parent="android:Theme.Holo.NoActionBar">
+        <item name="android:windowSoftInputMode">adjustPan</item>
+        <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
+        <item name="android:alertDialogTheme">@style/Theme.WifiDialog</item>
+        <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
+        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
+        <item name="ic_wps">@drawable/ic_wps_dark</item>
+        <item name="setup_divider_color">@color/setup_divider_color_dark</item>
+        <item name="wifi_signal">@drawable/wifi_signal_dark</item>
+    </style>
+
+    <style name="SetupWizardWifiTheme.Light" parent="android:Theme.Holo.Light.NoActionBar">
+        <item name="android:windowSoftInputMode">adjustPan</item>
+        <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
+        <item name="android:alertDialogTheme">@style/Theme.Light.WifiDialog</item>
+        <item name="ic_menu_add">@drawable/ic_menu_add_light</item>
+        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_light</item>
+        <item name="ic_wps">@drawable/ic_wps_light</item>
+        <item name="setup_divider_color">@color/setup_divider_color_light</item>
+        <item name="wifi_signal">@drawable/wifi_signal_light</item>
+    </style>
 
     <style name="Theme.WifiDialog" parent="@*android:style/Theme.Holo.Dialog.Alert">
         <item name="android:windowSoftInputMode">adjustResize</item>
+        <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
+        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
+        <item name="ic_wps">@drawable/ic_wps_dark</item>
+        <item name="wifi_signal">@drawable/wifi_signal_dark</item>
+    </style>
+
+    <style name="Theme.Light.WifiDialog" parent="@*android:style/Theme.Holo.Light.Dialog.Alert">
+        <item name="android:windowSoftInputMode">adjustResize</item>
+        <item name="ic_menu_add">@drawable/ic_menu_add_light</item>
+        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_light</item>
+        <item name="ic_wps">@drawable/ic_wps_light</item>
+        <item name="wifi_signal">@drawable/wifi_signal_light</item>
+    </style>
+
+    <style name="Theme.Settings" parent="@android:style/Theme.Holo">
+        <item name="@*android:preferenceHeaderPanelStyle">@style/PreferenceHeaderPanelSinglePane</item>
+        <item name="@*android:preferencePanelStyle">@style/PreferencePanelSinglePane</item>
+        <item name="@*android:preferenceListStyle">@style/PreferenceHeaderListSinglePane</item>
+        <item name="@*android:preferenceFragmentListStyle">@style/PreferenceFragmentListSinglePane</item>
+        <item name="@*android:preferenceFragmentPaddingSide">@dimen/settings_side_margin</item>
+        <item name="apnPreferenceStyle">@style/ApnPreference</item>
+        <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
+        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
+        <item name="ic_wps">@drawable/ic_wps_dark</item>
+        <item name="wifi_signal">@drawable/wifi_signal_dark</item>
+        <item name="android:actionBarStyle">@android:style/Widget.Holo.ActionBar.Solid</item>
     </style>
 </resources>
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index fa447f2900a..7b599b859e2 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -28,7 +28,12 @@
             android:title="@string/accessibility_system_title">
 
         <PreferenceScreen
-            android:fragment="com.android.settings.AccessibilitySettings$ToggleScreenMagnificationPreferenceFragment"
+            android:fragment="com.android.settings.accessibility.ToggleCaptioningPreferenceFragment"
+            android:key="captioning_preference_screen"
+            android:title="@string/accessibility_captioning_title" />
+
+        <PreferenceScreen
+            android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment"
             android:key="screen_magnification_preference_screen"
             android:title="@string/accessibility_screen_magnification_title"/>
 
@@ -53,7 +58,7 @@
                 android:persistent="false"/>
 
         <PreferenceScreen
-                android:fragment="com.android.settings.AccessibilitySettings$ToggleGlobalGesturePreferenceFragment"
+                android:fragment="com.android.settings.accessibility.ToggleGlobalGesturePreferenceFragment"
                 android:key="enable_global_gesture_preference_screen"
                 android:title="@string/accessibility_global_gesture_preference_title"/>
 
diff --git a/res/xml/captioning_settings.xml b/res/xml/captioning_settings.xml
new file mode 100644
index 00000000000..97739430798
--- /dev/null
+++ b/res/xml/captioning_settings.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:fragment="com.android.settings.accessibility.ToggleCaptioningPreferenceFragment"
+    android:key="captioning_preference_screen"
+    android:title="@string/accessibility_captioning_title" >
+
+    <PreferenceCategory
+        android:key="standard"
+        android:title="@string/captioning_standard_options_title" >
+        <com.android.settings.accessibility.LocalePreference
+            android:key="captioning_locale"
+            android:persistent="false"
+            android:summary="%s"
+            android:title="@string/captioning_locale" />
+
+        <ListPreference
+            android:entries="@array/captioning_font_size_selector_titles"
+            android:entryValues="@array/captioning_font_size_selector_values"
+            android:key="captioning_font_size"
+            android:persistent="false"
+            android:summary="%s"
+            android:title="@string/captioning_text_size" />
+
+        <com.android.settings.accessibility.PresetPreference
+            android:key="captioning_preset"
+            android:persistent="false"
+            android:title="@string/captioning_preset" />
+    </PreferenceCategory>
+    <PreferenceCategory
+        android:key="custom"
+        android:title="@string/captioning_custom_options_title" >
+        <ListPreference
+            android:entries="@array/captioning_typeface_selector_titles"
+            android:entryValues="@array/captioning_typeface_selector_values"
+            android:key="captioning_typeface"
+            android:persistent="false"
+            android:summary="%s"
+            android:title="@string/captioning_typeface" />
+
+        <com.android.settings.accessibility.ColorPreference
+            android:key="captioning_foreground_color"
+            android:persistent="false"
+            android:title="@string/captioning_foreground_color" />
+
+        <com.android.settings.accessibility.EdgeTypePreference
+            android:key="captioning_edge_type"
+            android:persistent="false"
+            android:title="@string/captioning_edge_type" />
+
+        <com.android.settings.accessibility.ColorPreference
+            android:dependency="captioning_edge_type"
+            android:key="captioning_edge_color"
+            android:persistent="false"
+            android:title="@string/captioning_edge_color" />
+        <com.android.settings.accessibility.ColorPreference
+            android:key="captioning_background_color"
+            android:persistent="false"
+            android:title="@string/captioning_background_color" />
+        <com.android.settings.accessibility.ColorPreference
+            android:dependency="captioning_background_color"
+            android:key="captioning_background_opacity"
+            android:persistent="false"
+            android:title="@string/captioning_background_opacity" />
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 72b73bbb00a..5989c90468c 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -37,6 +37,13 @@
         android:title="@string/keep_screen_on" 
         android:summary="@string/keep_screen_on_summary"/>
 
+    <ListPreference
+        android:key="select_runtime"
+        android:title="@string/select_runtime_title"
+        android:dialogTitle="@string/select_runtime_dialog_title"
+        android:entries="@array/select_runtime_titles"
+        android:entryValues="@array/select_runtime_values" />
+
     <ListPreference
         android:key="hdcp_checking"
         android:title="@string/hdcp_checking_title"
@@ -45,9 +52,15 @@
         android:entryValues="@array/hdcp_checking_values" />
 
     <CheckBoxPreference
-        android:key="enforce_read_external"
-        android:title="@string/enforce_read_external_title"
-        android:summary="@string/enforce_read_external_summary" />
+        android:key="bt_hci_snoop_log"
+        android:title="@string/bt_hci_snoop_log"
+        android:summary="@string/bt_hci_snoop_log_summary"/>
+
+    <PreferenceScreen android:key="proc_stats"
+            android:title="@string/process_stats_summary_title"
+            android:summary="@string/process_stats_summary"
+            android:fragment="com.android.settings.applications.ProcessStatsUi">
+    </PreferenceScreen>
 
     <PreferenceCategory android:key="debug_debugging_category"
             android:title="@string/debug_debugging_category">
@@ -60,6 +73,11 @@
         <Preference android:key="clear_adb_keys"
                 android:title="@string/clear_adb_keys" />
 
+        <CheckBoxPreference
+            android:key="enable_terminal"
+            android:title="@string/enable_terminal_title"
+            android:summary="@string/enable_terminal_summary" />
+
         <CheckBoxPreference
             android:key="bugreport_in_power"
             android:title="@string/bugreport_in_power"
@@ -83,6 +101,10 @@
             android:title="@string/verify_apps_over_usb_title"
             android:summary="@string/verify_apps_over_usb_summary"/>
 
+        <CheckBoxPreference
+            android:key="wifi_display_certification"
+            android:title="@string/wifi_display_certification"
+            android:summary="@string/wifi_display_certification_summary"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:key="debug_input_category"
@@ -113,6 +135,11 @@
             android:title="@string/debug_layout"
             android:summary="@string/debug_layout_summary"/>
 
+        <CheckBoxPreference
+            android:key="force_rtl_layout_all_locales"
+            android:title="@string/force_rtl_layout_all_locales"
+            android:summary="@string/force_rtl_layout_all_locales_summary"/>
+
         <ListPreference
             android:key="window_animation_scale"
             android:title="@string/window_animation_scale_title"
@@ -161,10 +188,12 @@
                 android:title="@string/show_hw_layers_updates"
                 android:summary="@string/show_hw_layers_updates_summary"/>
 
-        <CheckBoxPreference
-                android:key="show_hw_overdraw"
-                android:title="@string/show_hw_overdraw"
-                android:summary="@string/show_hw_overdraw_summary"/>
+        <ListPreference
+                android:key="debug_hw_overdraw"
+                android:title="@string/debug_hw_overdraw"
+                android:persistent="false"
+                android:entries="@array/debug_hw_overdraw_entries"
+                android:entryValues="@array/debug_hw_overdraw_values" />
 
         <ListPreference
                 android:key="show_non_rect_clip"
@@ -234,11 +263,6 @@
             android:title="@string/show_all_anrs"
             android:summary="@string/show_all_anrs_summary"/>
 
-        <CheckBoxPreference
-            android:key="experimental_webview"
-            android:title="@string/experimental_webview"
-            android:summary="@string/experimental_webview_summary"/>
-
      </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/file_paths.xml b/res/xml/file_paths.xml
new file mode 100644
index 00000000000..294c0cbfc97
--- /dev/null
+++ b/res/xml/file_paths.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Offer access to files under Context.getCacheDir() -->
+    <cache-path name="my_cache" />
+</paths>
diff --git a/res/xml/home_selection.xml b/res/xml/home_selection.xml
new file mode 100644
index 00000000000..a348f9d3ffe
--- /dev/null
+++ b/res/xml/home_selection.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/home_settings"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:key="home"
+        android:order="0">
+
+</PreferenceScreen>
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index f0014867cb7..3e7fdb52232 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -29,7 +29,8 @@
 
     <!-- User dictionary preference title and fragment will be set programmatically. -->
     <PreferenceScreen
-            android:key="key_user_dictionary_settings" />
+            android:key="key_user_dictionary_settings"
+            android:title="@string/user_dict_settings_title" />
 
     <PreferenceCategory android:key="keyboard_settings_category"
             android:title="@string/keyboard_settings_category">
diff --git a/res/xml/location_mode.xml b/res/xml/location_mode.xml
new file mode 100644
index 00000000000..3627f119b01
--- /dev/null
+++ b/res/xml/location_mode.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/location_mode_screen_title">
+
+        <com.android.settings.location.RadioButtonPreference
+            android:key="high_accuracy"
+            android:title="@string/location_mode_high_accuracy_title"
+            android:summary="@string/location_mode_high_accuracy_description"
+            android:persistent="false" />
+        <com.android.settings.location.RadioButtonPreference
+            android:key="battery_saving"
+            android:title="@string/location_mode_battery_saving_title"
+            android:summary="@string/location_mode_battery_saving_description"
+            android:persistent="false" />
+        <com.android.settings.location.RadioButtonPreference
+            android:key="sensors_only"
+            android:title="@string/location_mode_sensors_only_title"
+            android:summary="@string/location_mode_sensors_only_description"
+            android:persistent="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index ab212d82b8c..83b80b1baee 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -16,38 +16,17 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/location_settings_title">
-
-        <com.android.settings.WrappingSwitchPreference
-            android:key="location_toggle"
-            android:title="@string/location_access_title"
-            android:summary="@string/location_access_summary"
-            android:persistent="true"/>
+        <Preference
+            android:key="location_mode"
+            android:title="@string/location_mode_title"
+            android:summary="@string/location_mode_location_off_title" />
 
         <PreferenceCategory
-            android:key="location_sources"
-            android:title="@string/location_sources_heading" />
+            android:key="recent_location_requests"
+            android:title="@string/location_category_recent_location_requests" />
 
-        <CheckBoxPreference
-            android:key="location_gps"
-            android:title="@string/location_gps"
-            android:summary="@string/location_street_level"
-            android:dependency="location_toggle"
-            android:persistent="false" />
-
-        <com.android.settings.WrappingCheckBoxPreference
-            android:key="location_network"
-            android:title="@string/location_network_based"
-            android:summary="@string/location_neighborhood_level"
-            android:dependency="location_toggle"
-            android:persistent="false" />
-
-<!-- Disabled to avoid confusion on devices with no AGPS
-     For Google experience devices we want AGPS on by default (if supported) so we don't really need this.
-        <CheckBoxPreference
-            android:key="assisted_gps"
-            android:title="@string/assisted_gps"
-            android:summaryOn="@string/assisted_gps_enabled"
-            android:summaryOff="@string/assisted_gps_disabled"/>
--->
+        <PreferenceCategory
+            android:key="location_services"
+            android:title="@string/location_category_location_services" />
 
 </PreferenceScreen>
diff --git a/res/xml/nfc_payment_settings.xml b/res/xml/nfc_payment_settings.xml
new file mode 100644
index 00000000000..9b47dda1c08
--- /dev/null
+++ b/res/xml/nfc_payment_settings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+</PreferenceScreen>
diff --git a/res/xml/print_job_settings.xml b/res/xml/print_job_settings.xml
new file mode 100644
index 00000000000..a78cec1c250
--- /dev/null
+++ b/res/xml/print_job_settings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="@string/print_print_job">
+
+    <Preference
+            android:key="print_job_preference">
+    </Preference>
+
+    <Preference
+            android:key="print_job_message_preference"
+            android:layout="@layout/print_job_summary">
+    </Preference>
+
+</PreferenceScreen>
diff --git a/res/xml/print_settings.xml b/res/xml/print_settings.xml
new file mode 100644
index 00000000000..8a295637343
--- /dev/null
+++ b/res/xml/print_settings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="@string/print_settings_title">
+
+    <PreferenceCategory
+            android:key="print_jobs_category"
+            android:title="@string/print_print_jobs"
+            android:order="0">
+    </PreferenceCategory>
+
+    <PreferenceCategory
+            android:key="print_services_category"
+            android:title="@string/print_settings_title"
+            android:order="1">
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/process_stats_summary.xml b/res/xml/process_stats_summary.xml
new file mode 100644
index 00000000000..fbd87fd13b7
--- /dev/null
+++ b/res/xml/process_stats_summary.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/app_memory_use"
+        android:key="app_list">
+    <Preference
+        style="?android:attr/preferenceInformationStyle"
+        android:key="mem_status"
+        android:persistent="false"
+    />
+</PreferenceScreen>
diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml
index c830e6fa870..7236673c178 100644
--- a/res/xml/security_settings_biometric_weak.xml
+++ b/res/xml/security_settings_biometric_weak.xml
@@ -51,6 +51,10 @@
             android:key="power_button_instantly_locks"
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
+        <CheckBoxPreference
+            android:key="keyguard_enable_widgets"
+            android:title="@string/security_enable_widgets_title"/>
+
         <PreferenceScreen
             android:fragment="com.android.settings.OwnerInfoSettings"
             android:key="owner_info_settings"
diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml
index 60d3a9f1ad4..d29d221f65c 100644
--- a/res/xml/security_settings_chooser.xml
+++ b/res/xml/security_settings_chooser.xml
@@ -26,6 +26,10 @@
             android:summary="@string/unlock_set_unlock_mode_none"
             android:persistent="false"/>
 
+        <CheckBoxPreference
+            android:key="keyguard_enable_widgets"
+            android:title="@string/security_enable_widgets_title"/>
+
         <PreferenceScreen
             android:fragment="com.android.settings.OwnerInfoSettings"
             android:key="owner_info_settings"
diff --git a/res/xml/security_settings_lockscreen.xml b/res/xml/security_settings_lockscreen.xml
index 06ec934d2a4..eb40bd8bbdd 100644
--- a/res/xml/security_settings_lockscreen.xml
+++ b/res/xml/security_settings_lockscreen.xml
@@ -25,6 +25,11 @@
             android:title="@string/unlock_set_unlock_launch_picker_title"
             android:summary="@string/unlock_set_unlock_mode_off"
             android:persistent="false"/>
+
+        <CheckBoxPreference
+            android:key="keyguard_enable_widgets"
+            android:title="@string/security_enable_widgets_title"/>
+
         <PreferenceScreen
             android:fragment="com.android.settings.OwnerInfoSettings"
             android:key="owner_info_settings"
diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index 1ead7a9ff3f..dbbeb1df4fe 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -80,7 +80,8 @@
                 android:persistent="false"
                 android:fragment="com.android.settings.TrustedCredentialsSettings"/>
 
-        <Preference android:title="@string/credentials_install"
+        <Preference android:key="credentials_install"
+                android:title="@string/credentials_install"
                 android:summary="@string/credentials_install_summary"
                 android:persistent="false">
             <intent android:action="android.credentials.INSTALL"
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index 0e9c71d5a27..7cde2f5d428 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -38,6 +38,10 @@
             android:key="power_button_instantly_locks"
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
+        <CheckBoxPreference
+            android:key="keyguard_enable_widgets"
+            android:title="@string/security_enable_widgets_title"/>
+
         <PreferenceScreen
             android:fragment="com.android.settings.OwnerInfoSettings"
             android:key="owner_info_settings"
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index d47a99d0427..d8e06b3566a 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -42,6 +42,10 @@
             android:key="power_button_instantly_locks"
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
+        <CheckBoxPreference
+            android:key="keyguard_enable_widgets"
+            android:title="@string/security_enable_widgets_title"/>
+
         <PreferenceScreen
             android:fragment="com.android.settings.OwnerInfoSettings"
             android:key="owner_info_settings"
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index d44200fff54..1e8fbbeaba0 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -38,6 +38,10 @@
             android:key="power_button_instantly_locks"
             android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
 
+        <CheckBoxPreference
+            android:key="keyguard_enable_widgets"
+            android:title="@string/security_enable_widgets_title"/>
+
         <PreferenceScreen
             android:fragment="com.android.settings.OwnerInfoSettings"
             android:key="owner_info_settings"
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 05fa31f3d90..8744328d0a1 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -62,6 +62,13 @@
     <header android:id="@+id/device_section"
         android:title="@string/header_category_device" />
 
+    <!-- Home -->
+    <header
+        android:id="@+id/home_settings"
+        android:icon="@drawable/ic_settings_home"
+        android:fragment="com.android.settings.HomeSettings"
+        android:title="@string/home_settings" />
+
     <!-- Sound -->
     <header
         android:id="@+id/sound_settings"
@@ -104,6 +111,13 @@
         android:title="@string/user_settings_title"
         android:id="@+id/user_settings" />
 
+    <!-- Manage NFC payment apps -->
+    <header
+        android:fragment="com.android.settings.nfc.PaymentSettings"
+        android:icon="@drawable/ic_settings_nfc_payment"
+        android:title="@string/nfc_payment_settings_title"
+        android:id="@+id/nfc_payment_settings" />
+
     <!-- Manufacturer hook -->
     <header
         android:fragment="com.android.settings.WirelessSettings"
@@ -111,14 +125,13 @@
         <intent android:action="com.android.settings.MANUFACTURER_APPLICATION_SETTING" />
     </header>
 
-
     <!-- PERSONAL -->
     <header android:id="@+id/personal_section"
         android:title="@string/header_category_personal" />
 
     <!-- Location -->
     <header
-        android:fragment="com.android.settings.LocationSettings"
+        android:fragment="com.android.settings.location.LocationSettings"
         android:icon="@drawable/ic_settings_location"
         android:title="@string/location_settings_title"
         android:id="@+id/location_settings" />
@@ -152,7 +165,7 @@
     <header
             android:id="@+id/account_add"
             android:title="@string/add_account_label"
-            android:icon="@drawable/ic_menu_add">
+            android:icon="@drawable/ic_menu_add_dark">
         <intent
             android:action="android.settings.ADD_ACCOUNT_SETTINGS"/>
     </header>
@@ -171,10 +184,17 @@
     <!-- Accessibility feedback -->
     <header
         android:id="@+id/accessibility_settings"
-        android:fragment="com.android.settings.AccessibilitySettings"
+        android:fragment="com.android.settings.accessibility.AccessibilitySettings"
         android:icon="@drawable/ic_settings_accessibility"
         android:title="@string/accessibility_settings" />
 
+    <!-- Print -->
+    <header
+        android:id="@+id/print_settings"
+        android:fragment="com.android.settings.print.PrintSettingsFragment"
+        android:icon="@*android:drawable/ic_print"
+        android:title="@string/print_settings" />
+
     <!-- Development -->
     <header
         android:id="@+id/development_settings"
diff --git a/res/xml/timezones.xml b/res/xml/timezones.xml
index 0030cddbb4a..8c195fb397b 100644
--- a/res/xml/timezones.xml
+++ b/res/xml/timezones.xml
@@ -63,6 +63,7 @@
     <timezone id="Asia/Rangoon"></timezone>
     <timezone id="Asia/Krasnoyarsk"></timezone>
     <timezone id="Asia/Bangkok"></timezone>
+    <timezone id="Asia/Jakarta"></timezone>
     <timezone id="Asia/Shanghai"></timezone>
     <timezone id="Asia/Hong_Kong"></timezone>
     <timezone id="Asia/Irkutsk"></timezone>
diff --git a/res/xml/tts_settings.xml b/res/xml/tts_settings.xml
index 2b145d18828..ab132df9e3d 100644
--- a/res/xml/tts_settings.xml
+++ b/res/xml/tts_settings.xml
@@ -37,4 +37,9 @@
          android:persistent="false"
          android:title="@string/tts_play_example_title"
          android:summary="@string/tts_play_example_summary" />
+
+    <Preference android:key="tts_status"
+         style="?android:attr/preferenceInformationStyle"
+         android:persistent="false"
+         android:title="@string/tts_status_title"/>
 </PreferenceScreen>
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index cf393b35df6..3a0ab742d27 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -26,6 +26,6 @@
     <Preference
             android:key="user_add"
             android:title="@string/user_add_user_menu"
-            android:icon="@drawable/ic_menu_add" />
+            android:icon="@drawable/ic_menu_add_dark" />
 
 </PreferenceScreen>
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 059b01c74eb..c7b9019afbb 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -23,25 +23,10 @@
         android:persistent="false"
         android:disableDependentsState="true" />
 
-    <PreferenceScreen
-        android:fragment="com.android.settings.vpn2.VpnSettings"
-        android:key="vpn_settings"
-        android:title="@string/vpn_settings_title" />
-
-    <PreferenceScreen
-        android:fragment="com.android.settings.TetherSettings"
-        android:key="tether_settings"
-        android:title="@string/tether_settings_title_all" />
-
-    <PreferenceScreen
-        android:key="wimax_settings"
-        android:title="@string/wimax_settings"
-        android:summary="@string/wimax_settings_summary" >
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.settings.wimax"
-            android:targetClass="com.android.settings.wimax.WimaxSettings" />
-    </PreferenceScreen>
+    <com.android.settings.SmsListPreference
+        android:key="sms_application"
+        android:title="@string/sms_application_title"
+        android:persistent="false" />
 
     <CheckBoxPreference
         android:key="toggle_nfc"
@@ -54,6 +39,16 @@
         android:key="android_beam_settings"
         android:title="@string/android_beam_settings_title" />
 
+    <PreferenceScreen
+        android:fragment="com.android.settings.TetherSettings"
+        android:key="tether_settings"
+        android:title="@string/tether_settings_title_all" />
+
+    <PreferenceScreen
+        android:fragment="com.android.settings.vpn2.VpnSettings"
+        android:key="vpn_settings"
+        android:title="@string/vpn_settings_title" />
+
     <PreferenceScreen
         android:key="mobile_network_settings"
         android:title="@string/network_settings_title"
@@ -69,6 +64,15 @@
         android:title="@string/manage_mobile_plan_title"
         android:persistent="false" />
 
+    <PreferenceScreen
+        android:key="wimax_settings"
+        android:title="@string/wimax_settings" >
+        <intent
+            android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.settings.wimax"
+            android:targetClass="com.android.settings.wimax.WimaxSettings" />
+    </PreferenceScreen>
+
     <CheckBoxPreference
         android:key="toggle_nsd"
         android:title="@string/nsd_quick_toggle_title"
@@ -82,8 +86,7 @@
 
     <PreferenceScreen
         android:key="cell_broadcast_settings"
-        android:title="@string/cell_broadcast_settings"
-        android:summary="@string/cell_broadcast_settings_summary" >
+        android:title="@string/cell_broadcast_settings" >
         <intent
             android:action="android.intent.action.MAIN"
             android:targetPackage="com.android.cellbroadcastreceiver"
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
deleted file mode 100644
index ea4940e80b7..00000000000
--- a/src/com/android/settings/AccessibilitySettings.java
+++ /dev/null
@@ -1,1117 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.accessibilityservice.AccessibilityServiceInfo;
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.ActivityManagerNative;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.ComponentName;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.content.res.Configuration;
-import android.database.ContentObserver;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.RemoteException;
-import android.os.SystemProperties;
-import android.preference.CheckBoxPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceCategory;
-import android.preference.PreferenceScreen;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.text.TextUtils.SimpleStringSplitter;
-import android.view.Gravity;
-import android.view.KeyCharacterMap;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityManager;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.Switch;
-import android.widget.TextView;
-
-import com.android.internal.content.PackageMonitor;
-import com.android.internal.view.RotationPolicy;
-import com.android.settings.AccessibilitySettings.ToggleSwitch.OnBeforeCheckedChangeListener;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Activity with the accessibility settings.
- */
-public class AccessibilitySettings extends SettingsPreferenceFragment implements DialogCreatable,
-        Preference.OnPreferenceChangeListener {
-    private static final String DEFAULT_SCREENREADER_MARKET_LINK =
-            "market://search?q=pname:com.google.android.marvin.talkback";
-
-    private static final float LARGE_FONT_SCALE = 1.3f;
-
-    private static final String SYSTEM_PROPERTY_MARKET_URL = "ro.screenreader.market";
-
-    // Timeout before we update the services if packages are added/removed since
-    // the AccessibilityManagerService has to do that processing first to
-    // generate
-    // the AccessibilityServiceInfo we need for proper presentation.
-    private static final long DELAY_UPDATE_SERVICES_MILLIS = 1000;
-
-    private static final char ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR = ':';
-
-    private static final String KEY_INSTALL_ACCESSIBILITY_SERVICE_OFFERED_ONCE =
-            "key_install_accessibility_service_offered_once";
-
-    // Preference categories
-    private static final String SERVICES_CATEGORY = "services_category";
-    private static final String SYSTEM_CATEGORY = "system_category";
-
-    // Preferences
-    private static final String TOGGLE_LARGE_TEXT_PREFERENCE =
-            "toggle_large_text_preference";
-    private static final String TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE =
-            "toggle_power_button_ends_call_preference";
-    private static final String TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE =
-            "toggle_lock_screen_rotation_preference";
-    private static final String TOGGLE_SPEAK_PASSWORD_PREFERENCE =
-            "toggle_speak_password_preference";
-    private static final String SELECT_LONG_PRESS_TIMEOUT_PREFERENCE =
-            "select_long_press_timeout_preference";
-    private static final String 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";
-    private static final String EXTRA_CHECKED = "checked";
-    private static final String EXTRA_TITLE = "title";
-    private static final String EXTRA_SUMMARY = "summary";
-    private static final String EXTRA_SETTINGS_TITLE = "settings_title";
-    private static final String EXTRA_COMPONENT_NAME = "component_name";
-    private static final String EXTRA_SETTINGS_COMPONENT_NAME = "settings_component_name";
-
-    // Dialog IDs.
-    private static final int DIALOG_ID_NO_ACCESSIBILITY_SERVICES = 1;
-
-    // Auxiliary members.
-    private final static SimpleStringSplitter sStringColonSplitter =
-            new SimpleStringSplitter(ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR);
-
-    private static final Set<ComponentName> sInstalledServices = new HashSet<ComponentName>();
-
-    private final Map<String, String> mLongPressTimeoutValuetoTitleMap =
-            new HashMap<String, String>();
-
-    private final Configuration mCurConfig = new Configuration();
-
-    private final PackageMonitor mSettingsPackageMonitor = new SettingsPackageMonitor();
-
-    private final Handler mHandler = new Handler() {
-        @Override
-        public void dispatchMessage(Message msg) {
-            super.dispatchMessage(msg);
-            loadInstalledServices();
-            updateServicesPreferences();
-        }
-    };
-
-    private final SettingsContentObserver mSettingsContentObserver =
-            new SettingsContentObserver(mHandler) {
-        @Override
-        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;
-
-    private CheckBoxPreference mToggleLargeTextPreference;
-    private CheckBoxPreference mTogglePowerButtonEndsCallPreference;
-    private CheckBoxPreference mToggleLockScreenRotationPreference;
-    private CheckBoxPreference mToggleSpeakPasswordPreference;
-    private ListPreference mSelectLongPressTimeoutPreference;
-    private Preference mNoServicesMessagePreference;
-    private PreferenceScreen mDisplayMagnificationPreferenceScreen;
-    private PreferenceScreen mGlobalGesturePreferenceScreen;
-
-    private int mLongPressTimeoutDefault;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        addPreferencesFromResource(R.xml.accessibility_settings);
-        initializeAllPreferences();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        loadInstalledServices();
-        updateAllPreferences();
-
-        offerInstallAccessibilitySerivceOnce();
-
-        mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
-        mSettingsContentObserver.register(getContentResolver());
-        RotationPolicy.registerRotationPolicyListener(getActivity(),
-                mRotationPolicyListener);
-    }
-
-    @Override
-    public void onPause() {
-        mSettingsPackageMonitor.unregister();
-        RotationPolicy.unregisterRotationPolicyListener(getActivity(),
-                mRotationPolicyListener);
-        mSettingsContentObserver.unregister(getContentResolver());
-        super.onPause();
-    }
-
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference == mSelectLongPressTimeoutPreference) {
-            String stringValue = (String) newValue;
-            Settings.Secure.putInt(getContentResolver(),
-                    Settings.Secure.LONG_PRESS_TIMEOUT, Integer.parseInt(stringValue));
-            mSelectLongPressTimeoutPreference.setSummary(
-                    mLongPressTimeoutValuetoTitleMap.get(stringValue));
-            return true;
-        }
-        return false;
-    }
-    
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        if (mToggleLargeTextPreference == preference) {
-            handleToggleLargeTextPreferenceClick();
-            return true;
-        } else if (mTogglePowerButtonEndsCallPreference == preference) {
-            handleTogglePowerButtonEndsCallPreferenceClick();
-            return true;
-        } else if (mToggleLockScreenRotationPreference == preference) {
-            handleLockScreenRotationPreferenceClick();
-            return true;
-        } else if (mToggleSpeakPasswordPreference == preference) {
-            handleToggleSpeakPasswordPreferenceClick();
-            return true;
-        } else if (mGlobalGesturePreferenceScreen == preference) {
-            handleTogglEnableAccessibilityGesturePreferenceClick();
-            return true;
-        } else if (mDisplayMagnificationPreferenceScreen == preference) {
-            handleDisplayMagnificationPreferenceScreenClick();
-            return true;
-        }
-        return super.onPreferenceTreeClick(preferenceScreen, preference);
-    }
-
-    private void handleToggleLargeTextPreferenceClick() {
-        try {
-            mCurConfig.fontScale = mToggleLargeTextPreference.isChecked() ? LARGE_FONT_SCALE : 1;
-            ActivityManagerNative.getDefault().updatePersistentConfiguration(mCurConfig);
-        } catch (RemoteException re) {
-            /* ignore */
-        }
-    }
-
-    private void handleTogglePowerButtonEndsCallPreferenceClick() {
-        Settings.Secure.putInt(getContentResolver(),
-                Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
-                (mTogglePowerButtonEndsCallPreference.isChecked()
-                        ? Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP
-                        : Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF));
-    }
-
-    private void handleLockScreenRotationPreferenceClick() {
-        RotationPolicy.setRotationLockForAccessibility(getActivity(),
-                !mToggleLockScreenRotationPreference.isChecked());
-    }
-
-    private void handleToggleSpeakPasswordPreferenceClick() {
-        Settings.Secure.putInt(getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD,
-                mToggleSpeakPasswordPreference.isChecked() ? 1 : 0);
-    }
-
-    private void handleTogglEnableAccessibilityGesturePreferenceClick() {
-        Bundle extras = mGlobalGesturePreferenceScreen.getExtras();
-        extras.putString(EXTRA_TITLE, getString(
-                R.string.accessibility_global_gesture_preference_title));
-        extras.putString(EXTRA_SUMMARY, getString(
-                R.string.accessibility_global_gesture_preference_description));
-        extras.putBoolean(EXTRA_CHECKED, Settings.Global.getInt(getContentResolver(),
-                Settings.Global.ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED, 0) == 1);
-        super.onPreferenceTreeClick(mGlobalGesturePreferenceScreen,
-                mGlobalGesturePreferenceScreen);
-    }
-
-    private void handleDisplayMagnificationPreferenceScreenClick() {
-        Bundle extras = mDisplayMagnificationPreferenceScreen.getExtras();
-        extras.putString(EXTRA_TITLE, getString(
-                R.string.accessibility_screen_magnification_title));
-        extras.putCharSequence(EXTRA_SUMMARY, getActivity().getResources().getText(
-                R.string.accessibility_screen_magnification_summary));
-        extras.putBoolean(EXTRA_CHECKED, Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1);
-        super.onPreferenceTreeClick(mDisplayMagnificationPreferenceScreen,
-                mDisplayMagnificationPreferenceScreen);
-    }
-
-    private void initializeAllPreferences() {
-        mServicesCategory = (PreferenceCategory) findPreference(SERVICES_CATEGORY);
-        mSystemsCategory = (PreferenceCategory) findPreference(SYSTEM_CATEGORY);
-
-        // Large text.
-        mToggleLargeTextPreference =
-                (CheckBoxPreference) findPreference(TOGGLE_LARGE_TEXT_PREFERENCE);
-
-        // Power button ends calls.
-        mTogglePowerButtonEndsCallPreference =
-                (CheckBoxPreference) findPreference(TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE);
-        if (!KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
-                || !Utils.isVoiceCapable(getActivity())) {
-            mSystemsCategory.removePreference(mTogglePowerButtonEndsCallPreference);
-        }
-
-        // Lock screen rotation.
-        mToggleLockScreenRotationPreference =
-                (CheckBoxPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE);
-
-        // Speak passwords.
-        mToggleSpeakPasswordPreference =
-                (CheckBoxPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE);
-
-        // Long press timeout.
-        mSelectLongPressTimeoutPreference =
-                (ListPreference) findPreference(SELECT_LONG_PRESS_TIMEOUT_PREFERENCE);
-        mSelectLongPressTimeoutPreference.setOnPreferenceChangeListener(this);
-        if (mLongPressTimeoutValuetoTitleMap.size() == 0) {
-            String[] timeoutValues = getResources().getStringArray(
-                    R.array.long_press_timeout_selector_values);
-            mLongPressTimeoutDefault = Integer.parseInt(timeoutValues[0]);
-            String[] timeoutTitles = getResources().getStringArray(
-                    R.array.long_press_timeout_selector_titles);
-            final int timeoutValueCount = timeoutValues.length;
-            for (int i = 0; i < timeoutValueCount; i++) {
-                mLongPressTimeoutValuetoTitleMap.put(timeoutValues[i], timeoutTitles[i]);
-            }
-        }
-
-        // Display magnification.
-        mDisplayMagnificationPreferenceScreen = (PreferenceScreen) findPreference(
-                DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN);
-
-        // Global gesture.
-        mGlobalGesturePreferenceScreen =
-                (PreferenceScreen) findPreference(ENABLE_ACCESSIBILITY_GESTURE_PREFERENCE_SCREEN);
-    }
-
-    private void updateAllPreferences() {
-        updateServicesPreferences();
-        updateSystemPreferences();
-    }
-
-    private void updateServicesPreferences() {
-        // Since services category is auto generated we have to do a pass
-        // to generate it since services can come and go and then based on
-        // the global accessibility state to decided whether it is enabled.
-
-        // Generate.
-        mServicesCategory.removeAll();
-
-        AccessibilityManager accessibilityManager = AccessibilityManager.getInstance(getActivity());
-
-        List<AccessibilityServiceInfo> installedServices =
-                accessibilityManager.getInstalledAccessibilityServiceList();
-        Set<ComponentName> enabledServices = getEnabledServicesFromSettings(getActivity());
-
-        final boolean accessibilityEnabled = Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_ENABLED, 0) == 1;
-
-        for (int i = 0, count = installedServices.size(); i < count; ++i) {
-            AccessibilityServiceInfo info = installedServices.get(i);
-
-            PreferenceScreen preference = getPreferenceManager().createPreferenceScreen(
-                    getActivity());
-            String title = info.getResolveInfo().loadLabel(getPackageManager()).toString();
-
-            ServiceInfo serviceInfo = info.getResolveInfo().serviceInfo;
-            ComponentName componentName = new ComponentName(serviceInfo.packageName,
-                    serviceInfo.name);
-
-            preference.setKey(componentName.flattenToString());
-
-            preference.setTitle(title);
-            final boolean serviceEnabled = accessibilityEnabled
-                    && enabledServices.contains(componentName);
-            if (serviceEnabled) {
-                preference.setSummary(getString(R.string.accessibility_feature_state_on));
-            } else {
-                preference.setSummary(getString(R.string.accessibility_feature_state_off));
-            }
-
-            preference.setOrder(i);
-            preference.setFragment(ToggleAccessibilityServicePreferenceFragment.class.getName());
-            preference.setPersistent(true);
-
-            Bundle extras = preference.getExtras();
-            extras.putString(EXTRA_PREFERENCE_KEY, preference.getKey());
-            extras.putBoolean(EXTRA_CHECKED, serviceEnabled);
-            extras.putString(EXTRA_TITLE, title);
-
-            String description = info.loadDescription(getPackageManager());
-            if (TextUtils.isEmpty(description)) {
-                description = getString(R.string.accessibility_service_default_description);
-            }
-            extras.putString(EXTRA_SUMMARY, description);
-
-            String settingsClassName = info.getSettingsActivityName();
-            if (!TextUtils.isEmpty(settingsClassName)) {
-                extras.putString(EXTRA_SETTINGS_TITLE,
-                        getString(R.string.accessibility_menu_item_settings));
-                extras.putString(EXTRA_SETTINGS_COMPONENT_NAME,
-                        new ComponentName(info.getResolveInfo().serviceInfo.packageName,
-                                settingsClassName).flattenToString());
-            }
-
-            extras.putParcelable(EXTRA_COMPONENT_NAME, componentName);
-
-            mServicesCategory.addPreference(preference);
-        }
-
-        if (mServicesCategory.getPreferenceCount() == 0) {
-            if (mNoServicesMessagePreference == null) {
-                mNoServicesMessagePreference = new Preference(getActivity()) {
-                    @Override
-                    protected void onBindView(View view) {
-                        super.onBindView(view);
-                        TextView summaryView = (TextView) view.findViewById(R.id.summary);
-                        String title = getString(R.string.accessibility_no_services_installed);
-                        summaryView.setText(title);
-                    }
-                };
-                mNoServicesMessagePreference.setPersistent(false);
-                mNoServicesMessagePreference.setLayoutResource(
-                        R.layout.text_description_preference);
-                mNoServicesMessagePreference.setSelectable(false);
-            }
-            mServicesCategory.addPreference(mNoServicesMessagePreference);
-        }
-    }
-
-    private void updateSystemPreferences() {
-        // Large text.
-        try {
-            mCurConfig.updateFrom(ActivityManagerNative.getDefault().getConfiguration());
-        } catch (RemoteException re) {
-            /* ignore */
-        }
-        mToggleLargeTextPreference.setChecked(mCurConfig.fontScale == LARGE_FONT_SCALE);
-
-        // Power button ends calls.
-        if (KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
-                && Utils.isVoiceCapable(getActivity())) {
-            final int incallPowerBehavior = Settings.Secure.getInt(getContentResolver(),
-                    Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
-                    Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT);
-            final boolean powerButtonEndsCall =
-                    (incallPowerBehavior == Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP);
-            mTogglePowerButtonEndsCallPreference.setChecked(powerButtonEndsCall);
-        }
-
-        // Auto-rotate screen
-        updateLockScreenRotationCheckbox();
-
-        // Speak passwords.
-        final boolean speakPasswordEnabled = Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0) != 0;
-        mToggleSpeakPasswordPreference.setChecked(speakPasswordEnabled);
-
-        // Long press timeout.
-        final int longPressTimeout = Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.LONG_PRESS_TIMEOUT, mLongPressTimeoutDefault);
-        String value = String.valueOf(longPressTimeout);
-        mSelectLongPressTimeoutPreference.setValue(value);
-        mSelectLongPressTimeoutPreference.setSummary(mLongPressTimeoutValuetoTitleMap.get(value));
-
-        // Screen magnification.
-        final boolean magnificationEnabled = Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1;
-        if (magnificationEnabled) {
-            mDisplayMagnificationPreferenceScreen.setSummary(
-                    R.string.accessibility_feature_state_on);            
-        } else {
-            mDisplayMagnificationPreferenceScreen.setSummary(
-                    R.string.accessibility_feature_state_off);
-        }
-
-        // Global gesture
-        final boolean globalGestureEnabled = Settings.Global.getInt(getContentResolver(),
-                Settings.Global.ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED, 0) == 1;
-        if (globalGestureEnabled) {
-            mGlobalGesturePreferenceScreen.setSummary(
-                    R.string.accessibility_global_gesture_preference_summary_on);
-        } else {
-            mGlobalGesturePreferenceScreen.setSummary(
-                    R.string.accessibility_global_gesture_preference_summary_off);
-        }
-    }
-
-    private void updateLockScreenRotationCheckbox() {
-        Context context = getActivity();
-        if (context != null) {
-            mToggleLockScreenRotationPreference.setChecked(
-                    !RotationPolicy.isRotationLocked(context));
-        }
-    }
-
-    private void offerInstallAccessibilitySerivceOnce() {
-        // There is always one preference - if no services it is just a message.
-        if (mServicesCategory.getPreference(0) != mNoServicesMessagePreference) {
-            return;
-        }
-        SharedPreferences preferences = getActivity().getPreferences(Context.MODE_PRIVATE);
-        final boolean offerInstallService = !preferences.getBoolean(
-                KEY_INSTALL_ACCESSIBILITY_SERVICE_OFFERED_ONCE, false);
-        if (offerInstallService) {
-            String screenreaderMarketLink = SystemProperties.get(
-                    SYSTEM_PROPERTY_MARKET_URL,
-                    DEFAULT_SCREENREADER_MARKET_LINK);
-            Uri marketUri = Uri.parse(screenreaderMarketLink);
-            Intent marketIntent = new Intent(Intent.ACTION_VIEW, marketUri);
-
-            if (getPackageManager().resolveActivity(marketIntent, 0) == null) {
-                // Don't show the dialog if no market app is found/installed.
-                return;
-            }
-
-            preferences.edit().putBoolean(KEY_INSTALL_ACCESSIBILITY_SERVICE_OFFERED_ONCE,
-                    true).commit();
-            // Notify user that they do not have any accessibility
-            // services installed and direct them to Market to get TalkBack.
-            showDialog(DIALOG_ID_NO_ACCESSIBILITY_SERVICES);
-        }
-    }
-
-    @Override
-    public Dialog onCreateDialog(int dialogId) {
-        switch (dialogId) {
-            case DIALOG_ID_NO_ACCESSIBILITY_SERVICES:
-                return new AlertDialog.Builder(getActivity())
-                        .setTitle(R.string.accessibility_service_no_apps_title)
-                        .setMessage(R.string.accessibility_service_no_apps_message)
-                        .setPositiveButton(android.R.string.ok,
-                                new DialogInterface.OnClickListener() {
-                                    public void onClick(DialogInterface dialog, int which) {
-                                        // dismiss the dialog before launching
-                                        // the activity otherwise
-                                        // the dialog removal occurs after
-                                        // onSaveInstanceState which
-                                        // triggers an exception
-                                        removeDialog(DIALOG_ID_NO_ACCESSIBILITY_SERVICES);
-                                        String screenreaderMarketLink = SystemProperties.get(
-                                                SYSTEM_PROPERTY_MARKET_URL,
-                                                DEFAULT_SCREENREADER_MARKET_LINK);
-                                        Uri marketUri = Uri.parse(screenreaderMarketLink);
-                                        Intent marketIntent = new Intent(Intent.ACTION_VIEW,
-                                                marketUri);
-                                        startActivity(marketIntent);
-                                    }
-                                })
-                        .setNegativeButton(android.R.string.cancel, null)
-                        .create();
-            default:
-                return null;
-        }
-    }
-
-    private void loadInstalledServices() {
-        Set<ComponentName> installedServices = sInstalledServices;
-        installedServices.clear();
-
-        List<AccessibilityServiceInfo> installedServiceInfos =
-                AccessibilityManager.getInstance(getActivity())
-                        .getInstalledAccessibilityServiceList();
-        if (installedServiceInfos == null) {
-            return;
-        }
-
-        final int installedServiceInfoCount = installedServiceInfos.size();
-        for (int i = 0; i < installedServiceInfoCount; i++) {
-            ResolveInfo resolveInfo = installedServiceInfos.get(i).getResolveInfo();
-            ComponentName installedService = new ComponentName(
-                    resolveInfo.serviceInfo.packageName,
-                    resolveInfo.serviceInfo.name);
-            installedServices.add(installedService);
-        }
-    }
-
-    private static Set<ComponentName> getEnabledServicesFromSettings(Context context) {
-        String enabledServicesSetting = Settings.Secure.getString(context.getContentResolver(),
-                Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
-        if (enabledServicesSetting == null) {
-            enabledServicesSetting = "";
-        }
-        Set<ComponentName> enabledServices = new HashSet<ComponentName>();
-        SimpleStringSplitter colonSplitter = sStringColonSplitter;
-        colonSplitter.setString(enabledServicesSetting);
-        while (colonSplitter.hasNext()) {
-            String componentNameString = colonSplitter.next();
-            ComponentName enabledService = ComponentName.unflattenFromString(
-                    componentNameString);
-            if (enabledService != null) {
-                enabledServices.add(enabledService);
-            }
-        }
-        return enabledServices;
-    }
-
-    private class SettingsPackageMonitor extends PackageMonitor {
-
-        @Override
-        public void onPackageAdded(String packageName, int uid) {
-            Message message = mHandler.obtainMessage();
-            mHandler.sendMessageDelayed(message, DELAY_UPDATE_SERVICES_MILLIS);
-        }
-
-        @Override
-        public void onPackageAppeared(String packageName, int reason) {
-            Message message = mHandler.obtainMessage();
-            mHandler.sendMessageDelayed(message, DELAY_UPDATE_SERVICES_MILLIS);
-        }
-
-        @Override
-        public void onPackageDisappeared(String packageName, int reason) {
-            Message message = mHandler.obtainMessage();
-            mHandler.sendMessageDelayed(message, DELAY_UPDATE_SERVICES_MILLIS);
-        }
-
-        @Override
-        public void onPackageRemoved(String packageName, int uid) {
-            Message message = mHandler.obtainMessage();
-            mHandler.sendMessageDelayed(message, DELAY_UPDATE_SERVICES_MILLIS);
-        }
-    }
-
-    public static class ToggleSwitch extends Switch {
-
-        private OnBeforeCheckedChangeListener mOnBeforeListener;
-
-        public static interface OnBeforeCheckedChangeListener {
-            public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked);
-        }
-
-        public ToggleSwitch(Context context) {
-            super(context);
-        }
-
-        public void setOnBeforeCheckedChangeListener(OnBeforeCheckedChangeListener listener) {
-            mOnBeforeListener = listener;
-        }
-
-        @Override
-        public void setChecked(boolean checked) {
-            if (mOnBeforeListener != null
-                    && mOnBeforeListener.onBeforeCheckedChanged(this, checked)) {
-                return;
-            }
-            super.setChecked(checked);
-        }
-
-        public void setCheckedInternal(boolean checked) {
-            super.setChecked(checked);
-        }
-    }
-
-    public static class ToggleAccessibilityServicePreferenceFragment
-            extends ToggleFeaturePreferenceFragment implements DialogInterface.OnClickListener {
-
-        private static final int DIALOG_ID_ENABLE_WARNING = 1;
-        private static final int DIALOG_ID_DISABLE_WARNING = 2;
-
-        private final SettingsContentObserver mSettingsContentObserver =
-                new SettingsContentObserver(new Handler()) {
-            @Override
-            public void onChange(boolean selfChange, Uri uri) {
-                String settingValue = Settings.Secure.getString(getContentResolver(),
-                        Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
-                final boolean enabled = settingValue.contains(mComponentName.flattenToString());
-                mToggleSwitch.setCheckedInternal(enabled);
-            }
-        };
-
-        private ComponentName mComponentName;
-
-        private int mShownDialogId;
-
-        @Override
-        public void onResume() {
-            mSettingsContentObserver.register(getContentResolver());
-            super.onResume();
-        }
-
-        @Override
-        public void onPause() {
-            mSettingsContentObserver.unregister(getContentResolver());
-            super.onPause();
-        }
-
-        @Override
-        public void onPreferenceToggled(String preferenceKey, boolean enabled) {
-            // Parse the enabled services.
-            Set<ComponentName> enabledServices = getEnabledServicesFromSettings(getActivity());
-
-            // Determine enabled services and accessibility state.
-            ComponentName toggledService = ComponentName.unflattenFromString(preferenceKey);
-            boolean accessibilityEnabled = false;
-            if (enabled) {
-                enabledServices.add(toggledService);
-                // Enabling at least one service enables accessibility.
-                accessibilityEnabled = true;
-            } else {
-                enabledServices.remove(toggledService);
-                // Check how many enabled and installed services are present.
-                Set<ComponentName> installedServices = sInstalledServices;
-                for (ComponentName enabledService : enabledServices) {
-                    if (installedServices.contains(enabledService)) {
-                        // Disabling the last service disables accessibility.
-                        accessibilityEnabled = true;
-                        break;
-                    }
-                }
-            }
-
-            // Update the enabled services setting.
-            StringBuilder enabledServicesBuilder = new StringBuilder();
-            // Keep the enabled services even if they are not installed since we
-            // have no way to know whether the application restore process has
-            // completed. In general the system should be responsible for the
-            // clean up not settings.
-            for (ComponentName enabledService : enabledServices) {
-                enabledServicesBuilder.append(enabledService.flattenToString());
-                enabledServicesBuilder.append(ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR);
-            }
-            final int enabledServicesBuilderLength = enabledServicesBuilder.length();
-            if (enabledServicesBuilderLength > 0) {
-                enabledServicesBuilder.deleteCharAt(enabledServicesBuilderLength - 1);
-            }
-            Settings.Secure.putString(getContentResolver(),
-                    Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
-                    enabledServicesBuilder.toString());
-
-            // Update accessibility enabled.
-            Settings.Secure.putInt(getContentResolver(),
-                    Settings.Secure.ACCESSIBILITY_ENABLED, accessibilityEnabled ? 1 : 0);
-        }
-
-        // IMPORTANT: Refresh the info since there are dynamically changing capabilities. For
-        // example, before JellyBean MR2 the user was granting the explore by touch one.
-        private AccessibilityServiceInfo getAccessibilityServiceInfo() {
-            List<AccessibilityServiceInfo> serviceInfos = AccessibilityManager.getInstance(
-                    getActivity()).getInstalledAccessibilityServiceList();
-            final int serviceInfoCount = serviceInfos.size();
-            for (int i = 0; i < serviceInfoCount; i++) {
-                AccessibilityServiceInfo serviceInfo = serviceInfos.get(i);
-                ResolveInfo resolveInfo = serviceInfo.getResolveInfo();
-                if (mComponentName.getPackageName().equals(resolveInfo.serviceInfo.packageName)
-                        && mComponentName.getClassName().equals(resolveInfo.serviceInfo.name)) {
-                    return serviceInfo;
-                }
-            }
-            return null;
-        }
-
-        @Override
-        public Dialog onCreateDialog(int dialogId) {
-            switch (dialogId) {
-                case DIALOG_ID_ENABLE_WARNING: {
-                    mShownDialogId = DIALOG_ID_ENABLE_WARNING;
-                    AccessibilityServiceInfo info = getAccessibilityServiceInfo();
-                    if (info == null) {
-                        return null;
-                    }
-                    return new AlertDialog.Builder(getActivity())
-                        .setTitle(getString(R.string.enable_service_title,
-                                info.getResolveInfo().loadLabel(getPackageManager())))
-                        .setIconAttribute(android.R.attr.alertDialogIcon)
-                        .setView(createEnableDialogContentView(info))
-                        .setCancelable(true)
-                        .setPositiveButton(android.R.string.ok, this)
-                        .setNegativeButton(android.R.string.cancel, this)
-                        .create();
-                }
-                case DIALOG_ID_DISABLE_WARNING: {
-                    mShownDialogId = DIALOG_ID_DISABLE_WARNING;
-                    AccessibilityServiceInfo info = getAccessibilityServiceInfo();
-                    if (info == null) {
-                        return null;
-                    }
-                    return new AlertDialog.Builder(getActivity())
-                        .setTitle(getString(R.string.disable_service_title,
-                                info.getResolveInfo().loadLabel(getPackageManager())))
-                        .setIconAttribute(android.R.attr.alertDialogIcon)
-                        .setMessage(getString(R.string.disable_service_message,
-                                info.getResolveInfo().loadLabel(getPackageManager())))
-                        .setCancelable(true)
-                        .setPositiveButton(android.R.string.ok, this)
-                        .setNegativeButton(android.R.string.cancel, this)
-                        .create();
-                }
-                default: {
-                    throw new IllegalArgumentException();
-                }
-            }
-        }
-
-        private View createEnableDialogContentView(AccessibilityServiceInfo info) {
-            LayoutInflater inflater = (LayoutInflater) getSystemService(
-                    Context.LAYOUT_INFLATER_SERVICE);
-
-            View content = inflater.inflate(R.layout.enable_accessibility_service_dialog_content,
-                    null);
-
-            TextView capabilitiesHeaderView = (TextView) content.findViewById(
-                    R.id.capabilities_header);
-            capabilitiesHeaderView.setText(getString(R.string.capabilities_list_title,
-                    info.getResolveInfo().loadLabel(getPackageManager())));
-
-            LinearLayout capabilitiesView = (LinearLayout) content.findViewById(R.id.capabilities);
-
-            // This capability is implicit for all services.
-            View capabilityView = inflater.inflate(
-                    com.android.internal.R.layout.app_permission_item_old, null);
-
-            ImageView imageView = (ImageView) capabilityView.findViewById(
-                    com.android.internal.R.id.perm_icon);
-            imageView.setImageDrawable(getResources().getDrawable(
-                    com.android.internal.R.drawable.ic_text_dot));
-
-            TextView labelView = (TextView) capabilityView.findViewById(
-                    com.android.internal.R.id.permission_group);
-            labelView.setText(getString(R.string.capability_title_receiveAccessibilityEvents));
-
-            TextView descriptionView = (TextView) capabilityView.findViewById(
-                    com.android.internal.R.id.permission_list);
-            descriptionView.setText(getString(R.string.capability_desc_receiveAccessibilityEvents));
-
-            List<AccessibilityServiceInfo.CapabilityInfo> capabilities =
-                    info.getCapabilityInfos();
-
-            capabilitiesView.addView(capabilityView);
-
-            // Service specific capabilities.
-            final int capabilityCount = capabilities.size();
-            for (int i = 0; i < capabilityCount; i++) {
-                AccessibilityServiceInfo.CapabilityInfo capability = capabilities.get(i);
-
-                capabilityView = inflater.inflate(
-                        com.android.internal.R.layout.app_permission_item_old, null);
-
-                imageView = (ImageView) capabilityView.findViewById(
-                        com.android.internal.R.id.perm_icon);
-                imageView.setImageDrawable(getResources().getDrawable(
-                        com.android.internal.R.drawable.ic_text_dot));
-
-                labelView = (TextView) capabilityView.findViewById(
-                        com.android.internal.R.id.permission_group);
-                labelView.setText(getString(capability.titleResId));
-
-                descriptionView = (TextView) capabilityView.findViewById(
-                        com.android.internal.R.id.permission_list);
-                descriptionView.setText(getString(capability.descResId));
-
-                capabilitiesView.addView(capabilityView);
-            }
-
-            return content;
-        }
-
-        @Override
-        public void onClick(DialogInterface dialog, int which) {
-            final boolean checked;
-            switch (which) {
-                case DialogInterface.BUTTON_POSITIVE:
-                    checked = (mShownDialogId == DIALOG_ID_ENABLE_WARNING);
-                    mToggleSwitch.setCheckedInternal(checked);
-                    getArguments().putBoolean(EXTRA_CHECKED, checked);
-                    onPreferenceToggled(mPreferenceKey, checked);
-                    break;
-                case DialogInterface.BUTTON_NEGATIVE:
-                    checked = (mShownDialogId == DIALOG_ID_DISABLE_WARNING);
-                    mToggleSwitch.setCheckedInternal(checked);
-                    getArguments().putBoolean(EXTRA_CHECKED, checked);
-                    onPreferenceToggled(mPreferenceKey, checked);
-                    break;
-                default:
-                    throw new IllegalArgumentException();
-            }
-        }
-
-        @Override
-        protected void onInstallActionBarToggleSwitch() {
-            super.onInstallActionBarToggleSwitch();
-            mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
-                @Override
-                public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
-                    if (checked) {
-                        toggleSwitch.setCheckedInternal(false);
-                        getArguments().putBoolean(EXTRA_CHECKED, false);
-                        showDialog(DIALOG_ID_ENABLE_WARNING);
-                    } else {
-                        toggleSwitch.setCheckedInternal(true);
-                        getArguments().putBoolean(EXTRA_CHECKED, true);
-                        showDialog(DIALOG_ID_DISABLE_WARNING);
-                    }
-                    return true;
-                }
-            });
-        }
-
-        @Override
-        protected void onProcessArguments(Bundle arguments) {
-            super.onProcessArguments(arguments);
-            // Settings title and intent.
-            String settingsTitle = arguments.getString(EXTRA_SETTINGS_TITLE);
-            String settingsComponentName = arguments.getString(EXTRA_SETTINGS_COMPONENT_NAME);
-            if (!TextUtils.isEmpty(settingsTitle) && !TextUtils.isEmpty(settingsComponentName)) {
-                Intent settingsIntent = new Intent(Intent.ACTION_MAIN).setComponent(
-                        ComponentName.unflattenFromString(settingsComponentName.toString()));
-                if (!getPackageManager().queryIntentActivities(settingsIntent, 0).isEmpty()) {
-                    mSettingsTitle = settingsTitle;
-                    mSettingsIntent = settingsIntent;
-                    setHasOptionsMenu(true);
-                }
-            }
-
-            mComponentName = arguments.getParcelable(EXTRA_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());
-            // Set a transparent drawable to prevent use of the default one.
-            getListView().setSelector(new ColorDrawable(Color.TRANSPARENT));
-            getListView().setDivider(null);
-        }
-
-        @Override
-        public void onDestroyView() {
-            getActivity().getActionBar().setCustomView(null);
-            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.setPaddingRelative(0, 0, padding, 0);
-            activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
-                    ActionBar.DISPLAY_SHOW_CUSTOM);
-            activity.getActionBar().setCustomView(toggleSwitch,
-                    new ActionBar.LayoutParams(ActionBar.LayoutParams.WRAP_CONTENT,
-                            ActionBar.LayoutParams.WRAP_CONTENT,
-                            Gravity.CENTER_VERTICAL | Gravity.END));
-            return toggleSwitch;
-        }
-
-        protected void onProcessArguments(Bundle arguments) {
-            // Key.
-            mPreferenceKey = arguments.getString(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/ApnPreference.java b/src/com/android/settings/ApnPreference.java
index 710eda23c4d..addb695cafc 100644
--- a/src/com/android/settings/ApnPreference.java
+++ b/src/com/android/settings/ApnPreference.java
@@ -35,31 +35,16 @@ public class ApnPreference extends Preference implements
         CompoundButton.OnCheckedChangeListener, OnClickListener {
     final static String TAG = "ApnPreference";
 
-    /**
-     * @param context
-     * @param attrs
-     * @param defStyle
-     */
     public ApnPreference(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
-        init();
     }
 
-    /**
-     * @param context
-     * @param attrs
-     */
     public ApnPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
+        this(context, attrs, R.attr.apnPreferenceStyle);
     }
 
-    /**
-     * @param context
-     */
     public ApnPreference(Context context) {
-        super(context);
-        init();
+        this(context, null);
     }
 
     private static String mSelectedKey = null;
@@ -99,10 +84,6 @@ public class ApnPreference extends Preference implements
         return view;
     }
 
-    private void init() {
-        setLayoutResource(R.layout.apn_preference_layout);
-    }
-
     public boolean isChecked() {
         return getKey().equals(mSelectedKey);
     }
diff --git a/src/com/android/settings/BatteryInfo.java b/src/com/android/settings/BatteryInfo.java
index 3f8827755ad..d35771fac7b 100644
--- a/src/com/android/settings/BatteryInfo.java
+++ b/src/com/android/settings/BatteryInfo.java
@@ -22,6 +22,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.BatteryManager;
+import android.os.BatteryStats;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IPowerManager;
@@ -163,7 +164,8 @@ public class BatteryInfo extends Activity {
         mUptime = (TextView) findViewById(R.id.uptime);
         
         // Get awake time plugged in and on battery
-        mBatteryStats = IBatteryStats.Stub.asInterface(ServiceManager.getService("batteryinfo"));
+        mBatteryStats = IBatteryStats.Stub.asInterface(ServiceManager.getService(
+                BatteryStats.SERVICE_NAME));
         mScreenStats = IPowerManager.Stub.asInterface(ServiceManager.getService(POWER_SERVICE));
         mHandler.sendEmptyMessageDelayed(EVENT_TICK, 1000);
         
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 14671d1c760..49de3668685 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -17,23 +17,28 @@
 package com.android.settings;
 
 import android.app.Activity;
+import android.app.Fragment;
 import android.app.PendingIntent;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.UserInfo;
 import android.os.Bundle;
+import android.os.Process;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.security.KeyStore;
+import android.util.EventLog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ListView;
 
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.ConfirmLockPattern.ConfirmLockPatternFragment;
 
 import java.util.List;
 
@@ -49,6 +54,15 @@ public class ChooseLockGeneric extends PreferenceActivity {
         return modIntent;
     }
 
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (ChooseLockGenericFragment.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
+
+    public static class InternalActivity extends ChooseLockGeneric {
+    }
+
     public static class ChooseLockGenericFragment extends SettingsPreferenceFragment {
         private static final int MIN_PASSWORD_LENGTH = 4;
         private static final String KEY_UNLOCK_BACKUP_INFO = "unlock_backup_info";
@@ -86,7 +100,9 @@ public class ChooseLockGeneric extends PreferenceActivity {
             // Defaults to needing to confirm credentials
             final boolean confirmCredentials = getActivity().getIntent()
                 .getBooleanExtra(CONFIRM_CREDENTIALS, true);
-            mPasswordConfirmed = !confirmCredentials;
+            if (getActivity() instanceof ChooseLockGeneric.InternalActivity) {
+                mPasswordConfirmed = !confirmCredentials;
+            }
 
             if (savedInstanceState != null) {
                 mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED);
@@ -122,6 +138,9 @@ public class ChooseLockGeneric extends PreferenceActivity {
                 Preference preference) {
             final String key = preference.getKey();
             boolean handled = true;
+
+            EventLog.writeEvent(EventLogTags.LOCK_SCREEN_TYPE, key);
+
             if (KEY_UNLOCK_SET_OFF.equals(key)) {
                 updateUnlockMethodAndFinish(
                         DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, true);
@@ -243,6 +262,8 @@ public class ChooseLockGeneric extends PreferenceActivity {
          * appropriately.)
          */
         private int upgradeQualityForEncryption(int quality) {
+            // Don't upgrade quality for secondary users. Encryption requirements don't apply.
+            if (!Process.myUserHandle().equals(UserHandle.OWNER)) return quality;
             int encryptionStatus = mDPM.getStorageEncryptionStatus();
             boolean encrypted = (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE)
                     || (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVATING);
@@ -325,7 +346,8 @@ public class ChooseLockGeneric extends PreferenceActivity {
         }
 
         private Intent getBiometricSensorIntent() {
-            Intent fallBackIntent = new Intent().setClass(getActivity(), ChooseLockGeneric.class);
+            Intent fallBackIntent = new Intent().setClass(getActivity(),
+                    ChooseLockGeneric.InternalActivity.class);
             fallBackIntent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, true);
             fallBackIntent.putExtra(CONFIRM_CREDENTIALS, false);
             fallBackIntent.putExtra(EXTRA_SHOW_FRAGMENT_TITLE,
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index b16f3f6787b..f43738f0414 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -19,6 +19,7 @@ package com.android.settings;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.PasswordEntryKeyboardHelper;
 import com.android.internal.widget.PasswordEntryKeyboardView;
+import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;
 
 import android.app.Activity;
 import android.app.Fragment;
@@ -64,6 +65,12 @@ public class ChooseLockPassword extends PreferenceActivity {
         return modIntent;
     }
 
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (ChooseLockPasswordFragment.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         // TODO: Fix on phones
@@ -154,6 +161,9 @@ public class ChooseLockPassword extends PreferenceActivity {
             super.onCreate(savedInstanceState);
             mLockPatternUtils = new LockPatternUtils(getActivity());
             Intent intent = getActivity().getIntent();
+            if (!(getActivity() instanceof ChooseLockPassword)) {
+                throw new SecurityException("Fragment contained in wrong activity");
+            }
             mRequestedQuality = Math.max(intent.getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY,
                     mRequestedQuality), mLockPatternUtils.getRequestedPasswordQuality());
             mPasswordMinLength = Math.max(
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index f9c01b6fc96..328312c2f73 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -22,6 +22,7 @@ import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.LockPatternView;
 import com.android.internal.widget.LockPatternView.Cell;
+import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;
 
 import static com.android.internal.widget.LockPatternView.DisplayMode;
 
@@ -68,6 +69,12 @@ public class ChooseLockPattern extends PreferenceActivity {
         return modIntent;
     }
 
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (ChooseLockPatternFragment.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         // requestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -301,6 +308,9 @@ public class ChooseLockPattern extends PreferenceActivity {
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
             mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity());
+            if (!(getActivity() instanceof ChooseLockPattern)) {
+                throw new SecurityException("Fragment contained in wrong activity");
+            }
         }
 
         @Override
@@ -331,7 +341,7 @@ public class ChooseLockPattern extends PreferenceActivity {
             topLayout.setDefaultTouchRecepient(mLockPatternView);
 
             final boolean confirmCredentials = getActivity().getIntent()
-                    .getBooleanExtra("confirm_credentials", false);
+                    .getBooleanExtra("confirm_credentials", true);
 
             if (savedInstanceState == null) {
                 if (confirmCredentials) {
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index 96839bab7bb..d7402daff89 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -19,6 +19,7 @@ package com.android.settings;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.PasswordEntryKeyboardHelper;
 import com.android.internal.widget.PasswordEntryKeyboardView;
+import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;
 
 import android.app.Activity;
 import android.app.Fragment;
@@ -51,6 +52,12 @@ public class ConfirmLockPassword extends PreferenceActivity {
         return modIntent;
     }
 
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (ConfirmLockPasswordFragment.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         // Disable IME on our window since we provide our own keyboard
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index dd375cc3c4f..3a1f06c339f 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -76,6 +76,12 @@ public class ConfirmLockPattern extends PreferenceActivity {
         return modIntent;
     }
 
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (ConfirmLockPatternFragment.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
+
     public static class ConfirmLockPatternFragment extends Fragment {
 
         // how long we wait to clear a wrong pattern
diff --git a/src/com/android/settings/CreateShortcut.java b/src/com/android/settings/CreateShortcut.java
index 0312a4bccd2..f71df1d6f16 100644
--- a/src/com/android/settings/CreateShortcut.java
+++ b/src/com/android/settings/CreateShortcut.java
@@ -18,10 +18,15 @@ package com.android.settings;
 
 import android.app.LauncherActivity;
 import android.content.Intent;
+import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ListView;
 
+import com.android.settings.Settings.TetherSettingsActivity;
+
+import java.util.List;
+
 public class CreateShortcut extends LauncherActivity {
 
     @Override
@@ -49,4 +54,22 @@ public class CreateShortcut extends LauncherActivity {
     protected boolean onEvaluateShowIcons() {
         return false;
     }
+
+    /**
+     * Perform query on package manager for list items.  The default
+     * implementation queries for activities.
+     */
+    protected List<ResolveInfo> onQueryPackageManager(Intent queryIntent) {
+        List<ResolveInfo> activities = super.onQueryPackageManager(queryIntent);
+        if (activities == null) return null;
+        for (int i = activities.size() - 1; i >= 0; i--) {
+            ResolveInfo info = activities.get(i);
+            if (info.activityInfo.name.endsWith(TetherSettingsActivity.class.getSimpleName())) {
+                if (!TetherSettings.showInShortcuts(this)) {
+                    activities.remove(i);
+                }
+            }
+        }
+        return activities;
+    }
 }
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index 9173e39cb5e..fcf208a9c00 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -25,6 +25,7 @@ import android.content.res.Resources;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.RemoteException;
+import android.os.Process;
 import android.security.Credentials;
 import android.security.KeyChain.KeyChainConnection;
 import android.security.KeyChain;
@@ -39,6 +40,14 @@ import android.widget.TextView;
 import android.widget.Toast;
 import com.android.internal.widget.LockPatternUtils;
 
+import com.android.org.bouncycastle.asn1.ASN1InputStream;
+import com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
+
+import org.apache.harmony.security.utils.AlgNameMapper;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
 /**
  * CredentialStorage handles KeyStore reset, unlock, and install.
  *
@@ -182,6 +191,20 @@ public final class CredentialStorage extends Activity {
         return (quality >= MIN_PASSWORD_QUALITY);
     }
 
+    private boolean isHardwareBackedKey(byte[] keyData) {
+        try {
+            ASN1InputStream bIn = new ASN1InputStream(new ByteArrayInputStream(keyData));
+            PrivateKeyInfo pki = PrivateKeyInfo.getInstance(bIn.readObject());
+            String algId = pki.getAlgorithmId().getAlgorithm().getId();
+            String algName = AlgNameMapper.map2AlgName(algId);
+
+            return KeyChain.isBoundKeyAlgorithm(algName);
+        } catch (IOException e) {
+            Log.e(TAG, "Failed to parse key data");
+            return false;
+        }
+    }
+
     /**
      * Install credentials if available, otherwise do nothing.
      */
@@ -196,17 +219,27 @@ public final class CredentialStorage extends Activity {
                 String key = bundle.getString(Credentials.EXTRA_USER_PRIVATE_KEY_NAME);
                 byte[] value = bundle.getByteArray(Credentials.EXTRA_USER_PRIVATE_KEY_DATA);
 
-                if (!mKeyStore.importKey(key, value, uid, KeyStore.FLAG_ENCRYPTED)) {
+                int flags = KeyStore.FLAG_ENCRYPTED;
+                if (uid == Process.WIFI_UID && isHardwareBackedKey(value)) {
+                    // Hardware backed keystore is secure enough to allow for WIFI stack
+                    // to enable access to secure networks without user intervention
+                    Log.d(TAG, "Saving private key with FLAG_NONE for WIFI_UID");
+                    flags = KeyStore.FLAG_NONE;
+                }
+
+                if (!mKeyStore.importKey(key, value, uid, flags)) {
                     Log.e(TAG, "Failed to install " + key + " as user " + uid);
                     return;
                 }
             }
 
+            int flags = (uid == Process.WIFI_UID) ? KeyStore.FLAG_NONE : KeyStore.FLAG_ENCRYPTED;
+
             if (bundle.containsKey(Credentials.EXTRA_USER_CERTIFICATE_NAME)) {
                 String certName = bundle.getString(Credentials.EXTRA_USER_CERTIFICATE_NAME);
                 byte[] certData = bundle.getByteArray(Credentials.EXTRA_USER_CERTIFICATE_DATA);
 
-                if (!mKeyStore.put(certName, certData, uid, KeyStore.FLAG_ENCRYPTED)) {
+                if (!mKeyStore.put(certName, certData, uid, flags)) {
                     Log.e(TAG, "Failed to install " + certName + " as user " + uid);
                     return;
                 }
@@ -216,7 +249,7 @@ public final class CredentialStorage extends Activity {
                 String caListName = bundle.getString(Credentials.EXTRA_CA_CERTIFICATES_NAME);
                 byte[] caListData = bundle.getByteArray(Credentials.EXTRA_CA_CERTIFICATES_DATA);
 
-                if (!mKeyStore.put(caListName, caListData, uid, KeyStore.FLAG_ENCRYPTED)) {
+                if (!mKeyStore.put(caListName, caListData, uid, flags)) {
                     Log.e(TAG, "Failed to install " + caListName + " as user " + uid);
                     return;
                 }
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 94c793ddc12..7057f1a497c 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -239,6 +239,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
             | StatusBarManager.DISABLE_NOTIFICATION_ALERTS
             | StatusBarManager.DISABLE_SYSTEM_INFO
             | StatusBarManager.DISABLE_HOME
+            | StatusBarManager.DISABLE_SEARCH
             | StatusBarManager.DISABLE_RECENT;
 
     /** @return whether or not this Activity was started for debugging the UI only. */
diff --git a/src/com/android/settings/CryptKeeperConfirm.java b/src/com/android/settings/CryptKeeperConfirm.java
index 9a7c21b3780..4822a836c28 100644
--- a/src/com/android/settings/CryptKeeperConfirm.java
+++ b/src/com/android/settings/CryptKeeperConfirm.java
@@ -53,6 +53,7 @@ public class CryptKeeperConfirm extends Fragment {
                     | StatusBarManager.DISABLE_NOTIFICATION_ALERTS
                     | StatusBarManager.DISABLE_SYSTEM_INFO
                     | StatusBarManager.DISABLE_HOME
+                    | StatusBarManager.DISABLE_SEARCH
                     | StatusBarManager.DISABLE_RECENT
                     | StatusBarManager.DISABLE_BACK);
 
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 8523b76d2a2..db1ae29dbd8 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -141,13 +141,13 @@ import com.android.settings.widget.ChartDataUsageView.DataUsageChartListener;
 import com.android.settings.widget.PieChartView;
 import com.google.android.collect.Lists;
 
+import libcore.util.Objects;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
-import libcore.util.Objects;
-
 /**
  * Panel showing data usage history across various networks, including options
  * to inspect based on usage cycle and control through {@link NetworkPolicy}.
@@ -276,6 +276,16 @@ public class DataUsageSummary extends Fragment {
         mPolicyEditor = new NetworkPolicyEditor(mPolicyManager);
         mPolicyEditor.read();
 
+        try {
+            if (!mNetworkService.isBandwidthControlEnabled()) {
+                Log.w(TAG, "No bandwidth control; leaving");
+                getActivity().finish();
+            }
+        } catch (RemoteException e) {
+            Log.w(TAG, "No bandwidth control; leaving");
+            getActivity().finish();
+        }
+
         try {
             mStatsSession = mStatsService.openSession();
         } catch (RemoteException e) {
@@ -312,15 +322,10 @@ public class DataUsageSummary extends Fragment {
         // on parent container for inset.
         final boolean shouldInset = mListView.getScrollBarStyle()
                 == View.SCROLLBARS_OUTSIDE_OVERLAY;
-        if (shouldInset) {
-            mInsetSide = view.getResources().getDimensionPixelOffset(
-                    com.android.internal.R.dimen.preference_fragment_padding_side);
-        } else {
-            mInsetSide = 0;
-        }
+        mInsetSide = 0;
 
         // adjust padding around tabwidget as needed
-        prepareCustomPreferencesList(container, view, mListView, true);
+        prepareCustomPreferencesList(container, view, mListView, false);
 
         mTabHost.setup();
         mTabHost.setOnTabChangedListener(mTabListener);
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 4597bf0d348..f3a22ca409e 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -16,17 +16,14 @@
 
 package com.android.settings;
 
-import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
-
 import android.app.ActionBar;
 import android.app.Activity;
 import android.app.ActivityManagerNative;
-import android.app.ActivityThread;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.app.admin.DevicePolicyManager;
 import android.app.backup.IBackupManager;
+import android.bluetooth.BluetoothAdapter;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -34,6 +31,7 @@ import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.hardware.usb.IUsbManager;
 import android.os.AsyncTask;
@@ -42,23 +40,21 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Parcel;
+import android.os.PowerManager;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.StrictMode;
 import android.os.SystemProperties;
 import android.os.UserHandle;
-import android.os.UserManager;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 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.webkit.WebViewFactory;
 import android.view.Gravity;
 import android.view.HardwareRenderer;
 import android.view.IWindowManager;
@@ -67,6 +63,9 @@ import android.widget.CompoundButton;
 import android.widget.Switch;
 import android.widget.TextView;
 
+import dalvik.system.VMRuntime;
+
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -74,7 +73,7 @@ import java.util.List;
 /*
  * Displays preferences for application developers.
  */
-public class DevelopmentSettings extends PreferenceFragment
+public class DevelopmentSettings extends RestrictedSettingsFragment
         implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener,
                 OnPreferenceChangeListener, CompoundButton.OnCheckedChangeListener {
     private static final String TAG = "DevelopmentSettings";
@@ -91,11 +90,14 @@ public class DevelopmentSettings extends PreferenceFragment
 
     private static final String ENABLE_ADB = "enable_adb";
     private static final String CLEAR_ADB_KEYS = "clear_adb_keys";
+    private static final String ENABLE_TERMINAL = "enable_terminal";
     private static final String KEEP_SCREEN_ON = "keep_screen_on";
+    private static final String BT_HCI_SNOOP_LOG = "bt_hci_snoop_log";
+    private static final String SELECT_RUNTIME_KEY = "select_runtime";
+    private static final String SELECT_RUNTIME_PROPERTY = "persist.sys.dalvik.vm.lib";
     private static final String ALLOW_MOCK_LOCATION = "allow_mock_location";
     private static final String HDCP_CHECKING_KEY = "hdcp_checking";
     private static final String HDCP_CHECKING_PROPERTY = "persist.sys.hdcp_checking";
-    private static final String ENFORCE_READ_EXTERNAL = "enforce_read_external";
     private static final String LOCAL_BACKUP_PASSWORD = "local_backup_password";
     private static final String HARDWARE_UI_PROPERTY = "persist.sys.ui.hw";
     private static final String MSAA_PROPERTY = "debug.egl.force_msaa";
@@ -118,14 +120,16 @@ public class DevelopmentSettings extends PreferenceFragment
     private static final String SHOW_NON_RECTANGULAR_CLIP_KEY = "show_non_rect_clip";
     private static final String SHOW_HW_SCREEN_UPDATES_KEY = "show_hw_screen_udpates";
     private static final String SHOW_HW_LAYERS_UPDATES_KEY = "show_hw_layers_udpates";
-    private static final String SHOW_HW_OVERDRAW_KEY = "show_hw_overdraw";
+    private static final String DEBUG_HW_OVERDRAW_KEY = "debug_hw_overdraw";
     private static final String DEBUG_LAYOUT_KEY = "debug_layout";
+    private static final String FORCE_RTL_LAYOUT_KEY = "force_rtl_layout_all_locales";
     private static final String WINDOW_ANIMATION_SCALE_KEY = "window_animation_scale";
     private static final String TRANSITION_ANIMATION_SCALE_KEY = "transition_animation_scale";
     private static final String ANIMATOR_DURATION_SCALE_KEY = "animator_duration_scale";
     private static final String OVERLAY_DISPLAY_DEVICES_KEY = "overlay_display_devices";
     private static final String DEBUG_DEBUGGING_CATEGORY_KEY = "debug_debugging_category";
     private static final String DEBUG_APPLICATIONS_CATEGORY_KEY = "debug_applications_category";
+    private static final String WIFI_DISPLAY_CERTIFICATION_KEY = "wifi_display_certification";
 
     private static final String OPENGL_TRACES_KEY = "enable_opengl_traces";
 
@@ -135,12 +139,12 @@ public class DevelopmentSettings extends PreferenceFragment
 
     private static final String SHOW_ALL_ANRS_KEY = "show_all_anrs";
 
-    private static final String WEBVIEW_EXPERIMENTAL_KEY = "experimental_webview";
-
     private static final String TAG_CONFIRM_ENFORCE = "confirm_enforce";
 
     private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
 
+    private static final String TERMINAL_APP_PACKAGE = "com.android.terminal";
+
     private static final int RESULT_DEBUG_APP = 1000;
 
     private IWindowManager mWindowManager;
@@ -154,10 +158,11 @@ public class DevelopmentSettings extends PreferenceFragment
 
     private CheckBoxPreference mEnableAdb;
     private Preference mClearAdbKeys;
+    private CheckBoxPreference mEnableTerminal;
     private Preference mBugreport;
     private CheckBoxPreference mBugreportInPower;
     private CheckBoxPreference mKeepScreenOn;
-    private CheckBoxPreference mEnforceReadExternal;
+    private CheckBoxPreference mBtHciSnoopLog;
     private CheckBoxPreference mAllowMockLocation;
     private PreferenceScreen mPassword;
 
@@ -165,6 +170,7 @@ public class DevelopmentSettings extends PreferenceFragment
     private Preference mDebugAppPref;
     private CheckBoxPreference mWaitForDebugger;
     private CheckBoxPreference mVerifyAppsOverUsb;
+    private CheckBoxPreference mWifiDisplayCertification;
 
     private CheckBoxPreference mStrictMode;
     private CheckBoxPreference mPointerLocation;
@@ -176,8 +182,9 @@ public class DevelopmentSettings extends PreferenceFragment
     private CheckBoxPreference mForceMsaa;
     private CheckBoxPreference mShowHwScreenUpdates;
     private CheckBoxPreference mShowHwLayersUpdates;
-    private CheckBoxPreference mShowHwOverdraw;
     private CheckBoxPreference mDebugLayout;
+    private CheckBoxPreference mForceRtlLayout;
+    private ListPreference mDebugHwOverdraw;
     private ListPreference mTrackFrameTime;
     private ListPreference mShowNonRectClip;
     private ListPreference mWindowAnimationScale;
@@ -190,7 +197,6 @@ public class DevelopmentSettings extends PreferenceFragment
     private ListPreference mAppProcessLimit;
 
     private CheckBoxPreference mShowAllANRs;
-    private CheckBoxPreference mExperimentalWebView;
 
     private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>();
     private final ArrayList<CheckBoxPreference> mResetCbPrefs
@@ -206,6 +212,10 @@ public class DevelopmentSettings extends PreferenceFragment
 
     private boolean mUnavailable;
 
+    public DevelopmentSettings() {
+        super(RESTRICTIONS_PIN_SET);
+    }
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -223,20 +233,26 @@ public class DevelopmentSettings extends PreferenceFragment
 
         addPreferencesFromResource(R.xml.development_prefs);
 
+        final PreferenceGroup debugDebuggingCategory = (PreferenceGroup)
+                findPreference(DEBUG_DEBUGGING_CATEGORY_KEY);
+
         mEnableAdb = findAndInitCheckboxPref(ENABLE_ADB);
         mClearAdbKeys = findPreference(CLEAR_ADB_KEYS);
         if (!SystemProperties.getBoolean("ro.adb.secure", false)) {
-            PreferenceGroup debugDebuggingCategory = (PreferenceGroup)
-                    findPreference(DEBUG_DEBUGGING_CATEGORY_KEY);
             if (debugDebuggingCategory != null) {
                 debugDebuggingCategory.removePreference(mClearAdbKeys);
             }
         }
+        mEnableTerminal = findAndInitCheckboxPref(ENABLE_TERMINAL);
+        if (!isPackageInstalled(getActivity(), TERMINAL_APP_PACKAGE)) {
+            debugDebuggingCategory.removePreference(mEnableTerminal);
+            mEnableTerminal = null;
+        }
 
         mBugreport = findPreference(BUGREPORT);
         mBugreportInPower = findAndInitCheckboxPref(BUGREPORT_IN_POWER_KEY);
         mKeepScreenOn = findAndInitCheckboxPref(KEEP_SCREEN_ON);
-        mEnforceReadExternal = findAndInitCheckboxPref(ENFORCE_READ_EXTERNAL);
+        mBtHciSnoopLog = findAndInitCheckboxPref(BT_HCI_SNOOP_LOG);
         mAllowMockLocation = findAndInitCheckboxPref(ALLOW_MOCK_LOCATION);
         mPassword = (PreferenceScreen) findPreference(LOCAL_BACKUP_PASSWORD);
         mAllPrefs.add(mPassword);
@@ -244,6 +260,7 @@ public class DevelopmentSettings extends PreferenceFragment
         if (!android.os.Process.myUserHandle().equals(UserHandle.OWNER)) {
             disableForUser(mEnableAdb);
             disableForUser(mClearAdbKeys);
+            disableForUser(mEnableTerminal);
             disableForUser(mPassword);
         }
 
@@ -252,8 +269,6 @@ public class DevelopmentSettings extends PreferenceFragment
         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 {
@@ -272,8 +287,10 @@ public class DevelopmentSettings extends PreferenceFragment
         mShowNonRectClip = addListPreference(SHOW_NON_RECTANGULAR_CLIP_KEY);
         mShowHwScreenUpdates = findAndInitCheckboxPref(SHOW_HW_SCREEN_UPDATES_KEY);
         mShowHwLayersUpdates = findAndInitCheckboxPref(SHOW_HW_LAYERS_UPDATES_KEY);
-        mShowHwOverdraw = findAndInitCheckboxPref(SHOW_HW_OVERDRAW_KEY);
         mDebugLayout = findAndInitCheckboxPref(DEBUG_LAYOUT_KEY);
+        mForceRtlLayout = findAndInitCheckboxPref(FORCE_RTL_LAYOUT_KEY);
+        mDebugHwOverdraw = addListPreference(DEBUG_HW_OVERDRAW_KEY);
+        mWifiDisplayCertification = findAndInitCheckboxPref(WIFI_DISPLAY_CERTIFICATION_KEY);
         mWindowAnimationScale = addListPreference(WINDOW_ANIMATION_SCALE_KEY);
         mTransitionAnimationScale = addListPreference(TRANSITION_ANIMATION_SCALE_KEY);
         mAnimatorDurationScale = addListPreference(ANIMATOR_DURATION_SCALE_KEY);
@@ -291,22 +308,17 @@ public class DevelopmentSettings extends PreferenceFragment
         mAllPrefs.add(mShowAllANRs);
         mResetCbPrefs.add(mShowAllANRs);
 
-        if (WebViewFactory.isExperimentalWebViewAvailable()) {
-            mExperimentalWebView = findAndInitCheckboxPref(WEBVIEW_EXPERIMENTAL_KEY);
-        } else {
-            Preference experimentalWebView = findPreference(WEBVIEW_EXPERIMENTAL_KEY);
-            PreferenceGroup debugApplicationsCategory = (PreferenceGroup)
-                    findPreference(DEBUG_APPLICATIONS_CATEGORY_KEY);
-            if (debugApplicationsCategory != null) {
-                debugApplicationsCategory.removePreference(experimentalWebView);
-            }
+        Preference selectRuntime = findPreference(SELECT_RUNTIME_KEY);
+        if (selectRuntime != null) {
+            mAllPrefs.add(selectRuntime);
+            filterRuntimeOptions(selectRuntime);
         }
 
         Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);
         if (hdcpChecking != null) {
             mAllPrefs.add(hdcpChecking);
+            removePreferenceForProduction(hdcpChecking);
         }
-        removeHdcpOptionsForProduction();
     }
 
     private ListPreference addListPreference(String prefKey) {
@@ -370,15 +382,17 @@ public class DevelopmentSettings extends PreferenceFragment
         activity.getActionBar().setCustomView(null);
     }
 
-    private void removeHdcpOptionsForProduction() {
+    private boolean removePreferenceForProduction(Preference preference) {
         if ("user".equals(Build.TYPE)) {
-            Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);
-            if (hdcpChecking != null) {
-                // Remove the preference
-                getPreferenceScreen().removePreference(hdcpChecking);
-                mAllPrefs.remove(hdcpChecking);
-            }
+            removePreference(preference);
+            return true;
         }
+        return false;
+    }
+
+    private void removePreference(Preference preference) {
+        getPreferenceScreen().removePreference(preference);
+        mAllPrefs.remove(preference);
     }
 
     private void setPrefsEnabledState(boolean enabled) {
@@ -443,13 +457,20 @@ public class DevelopmentSettings extends PreferenceFragment
         mHaveDebugSettings = false;
         updateCheckBox(mEnableAdb, Settings.Global.getInt(cr,
                 Settings.Global.ADB_ENABLED, 0) != 0);
+        if (mEnableTerminal != null) {
+            updateCheckBox(mEnableTerminal,
+                    context.getPackageManager().getApplicationEnabledSetting(TERMINAL_APP_PACKAGE)
+                    == PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
+        }
         updateCheckBox(mBugreportInPower, Settings.Secure.getInt(cr,
                 Settings.Secure.BUGREPORT_IN_POWER_MENU, 0) != 0);
         updateCheckBox(mKeepScreenOn, Settings.Global.getInt(cr,
                 Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);
-        updateCheckBox(mEnforceReadExternal, isPermissionEnforced(READ_EXTERNAL_STORAGE));
+        updateCheckBox(mBtHciSnoopLog, Settings.Secure.getInt(cr,
+                Settings.Secure.BLUETOOTH_HCI_LOG, 0) != 0);
         updateCheckBox(mAllowMockLocation, Settings.Secure.getInt(cr,
                 Settings.Secure.ALLOW_MOCK_LOCATION, 0) != 0);
+        updateRuntimeValue();
         updateHdcpValues();
         updatePasswordSummary();
         updateDebuggerOptions();
@@ -464,7 +485,7 @@ public class DevelopmentSettings extends PreferenceFragment
         updateShowNonRectClipOptions();
         updateShowHwScreenUpdatesOptions();
         updateShowHwLayersUpdatesOptions();
-        updateShowHwOverdrawOptions();
+        updateDebugHwOverdrawOptions();
         updateDebugLayoutOptions();
         updateAnimationScaleOptions();
         updateOverlayDisplayDevicesOptions();
@@ -472,9 +493,10 @@ public class DevelopmentSettings extends PreferenceFragment
         updateImmediatelyDestroyActivitiesOptions();
         updateAppProcessLimitOptions();
         updateShowAllANRsOptions();
-        updateExperimentalWebViewOptions();
         updateVerifyAppsOverUsbOptions();
         updateBugreportOptions();
+        updateForceRtlOptions();
+        updateWifiDisplayCertificationOptions();
     }
 
     private void resetDangerousOptions() {
@@ -498,13 +520,60 @@ public class DevelopmentSettings extends PreferenceFragment
         pokeSystemProperties();
     }
 
+    void filterRuntimeOptions(Preference selectRuntime) {
+        ListPreference pref = (ListPreference) selectRuntime;
+        ArrayList<String> validValues = new ArrayList<String>();
+        ArrayList<String> validSummaries = new ArrayList<String>();
+        String[] values = getResources().getStringArray(R.array.select_runtime_values);
+        String[] summaries = getResources().getStringArray(R.array.select_runtime_summaries);
+        for (int i = 0; i < values.length; i++) {
+            String value = values[i];
+            String summary = summaries[i];
+            if (new File("/system/lib/" + value).exists()) {
+                validValues.add(value);
+                validSummaries.add(summary);
+            }
+        }
+        int count = validValues.size();
+        if (count <= 1) {
+            // no choices, so remove preference
+            removePreference(selectRuntime);
+        } else {
+            pref.setEntryValues(validValues.toArray(new String[count]));
+            pref.setEntries(validSummaries.toArray(new String[count]));
+        }
+    }
+
+    private String currentRuntimeValue() {
+        return SystemProperties.get(SELECT_RUNTIME_PROPERTY, VMRuntime.getRuntime().vmLibrary());
+    }
+
+    private void updateRuntimeValue() {
+        ListPreference selectRuntime = (ListPreference) findPreference(SELECT_RUNTIME_KEY);
+        if (selectRuntime != null) {
+            String currentValue = currentRuntimeValue();
+            String[] values = getResources().getStringArray(R.array.select_runtime_values);
+            String[] summaries = getResources().getStringArray(R.array.select_runtime_summaries);
+            int index = 0;
+            for (int i = 0; i < values.length; i++) {
+                if (currentValue.equals(values[i])) {
+                    index = i;
+                    break;
+                }
+            }
+            selectRuntime.setValue(values[index]);
+            selectRuntime.setSummary(summaries[index]);
+            selectRuntime.setOnPreferenceChangeListener(this);
+        }
+    }
+
     private void updateHdcpValues() {
-        int index = 1; // Defaults to drm-only. Needs to match with R.array.hdcp_checking_values
         ListPreference hdcpChecking = (ListPreference) findPreference(HDCP_CHECKING_KEY);
         if (hdcpChecking != null) {
             String currentValue = SystemProperties.get(HDCP_CHECKING_PROPERTY);
             String[] values = getResources().getStringArray(R.array.hdcp_checking_values);
             String[] summaries = getResources().getStringArray(R.array.hdcp_checking_summaries);
+            int index = 1; // Defaults to drm-only. Needs to match with R.array.hdcp_checking_values
             for (int i = 0; i < values.length; i++) {
                 if (currentValue.equals(values[i])) {
                     index = i;
@@ -529,6 +598,14 @@ public class DevelopmentSettings extends PreferenceFragment
         }
     }
 
+    private void writeBtHciSnoopLogOptions() {
+        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        adapter.configHciSnoopLog(mBtHciSnoopLog.isChecked());
+        Settings.Secure.putInt(getActivity().getContentResolver(),
+                Settings.Secure.BLUETOOTH_HCI_LOG,
+                mBtHciSnoopLog.isChecked() ? 1 : 0);
+    }
+
     private void writeDebuggerOptions() {
         try {
             ActivityManagerNative.getDefault().setDebugApp(
@@ -701,7 +778,7 @@ public class DevelopmentSettings extends PreferenceFragment
             if (flinger != null) {
                 Parcel data = Parcel.obtain();
                 data.writeInterfaceToken("android.ui.ISurfaceComposer");
-                final int showUpdates = mShowScreenUpdates.isChecked() ? 1 : 0; 
+                final int showUpdates = mShowScreenUpdates.isChecked() ? 1 : 0;
                 data.writeInt(showUpdates);
                 flinger.transact(1002, data, null, 0);
                 data.recycle();
@@ -718,7 +795,7 @@ public class DevelopmentSettings extends PreferenceFragment
             if (flinger != null) {
                 Parcel data = Parcel.obtain();
                 data.writeInterfaceToken("android.ui.ISurfaceComposer");
-                final int disableOverlays = mDisableOverlays.isChecked() ? 1 : 0; 
+                final int disableOverlays = mDisableOverlays.isChecked() ? 1 : 0;
                 data.writeInt(disableOverlays);
                 flinger.transact(1008, data, null, 0);
                 data.recycle();
@@ -732,7 +809,7 @@ public class DevelopmentSettings extends PreferenceFragment
     private void updateHardwareUiOptions() {
         updateCheckBox(mForceHardwareUi, SystemProperties.getBoolean(HARDWARE_UI_PROPERTY, false));
     }
-    
+
     private void writeHardwareUiOptions() {
         SystemProperties.set(HARDWARE_UI_PROPERTY, mForceHardwareUi.isChecked() ? "true" : "false");
         pokeSystemProperties();
@@ -820,15 +897,29 @@ public class DevelopmentSettings extends PreferenceFragment
         pokeSystemProperties();
     }
 
-    private void updateShowHwOverdrawOptions() {
-        updateCheckBox(mShowHwOverdraw, SystemProperties.getBoolean(
-                HardwareRenderer.DEBUG_SHOW_OVERDRAW_PROPERTY, false));
+    private void updateDebugHwOverdrawOptions() {
+        String value = SystemProperties.get(HardwareRenderer.DEBUG_OVERDRAW_PROPERTY);
+        if (value == null) {
+            value = "";
+        }
+
+        CharSequence[] values = mDebugHwOverdraw.getEntryValues();
+        for (int i = 0; i < values.length; i++) {
+            if (value.contentEquals(values[i])) {
+                mDebugHwOverdraw.setValueIndex(i);
+                mDebugHwOverdraw.setSummary(mDebugHwOverdraw.getEntries()[i]);
+                return;
+            }
+        }
+        mDebugHwOverdraw.setValueIndex(0);
+        mDebugHwOverdraw.setSummary(mDebugHwOverdraw.getEntries()[0]);
     }
 
-    private void writeShowHwOverdrawOptions() {
-        SystemProperties.set(HardwareRenderer.DEBUG_SHOW_OVERDRAW_PROPERTY,
-                mShowHwOverdraw.isChecked() ? "true" : null);
+    private void writeDebugHwOverdrawOptions(Object newValue) {
+        SystemProperties.set(HardwareRenderer.DEBUG_OVERDRAW_PROPERTY,
+                newValue == null ? "" : newValue.toString());
         pokeSystemProperties();
+        updateDebugHwOverdrawOptions();
     }
 
     private void updateDebugLayoutOptions() {
@@ -842,11 +933,36 @@ public class DevelopmentSettings extends PreferenceFragment
         pokeSystemProperties();
     }
 
+    private void updateForceRtlOptions() {
+        updateCheckBox(mForceRtlLayout, Settings.Global.getInt(getActivity().getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RTL, 0) != 0);
+    }
+
+    private void writeForceRtlOptions() {
+        boolean value = mForceRtlLayout.isChecked();
+        Settings.Global.putInt(getActivity().getContentResolver(),
+                Settings.Global.DEVELOPMENT_FORCE_RTL, value ? 1 : 0);
+        SystemProperties.set(Settings.Global.DEVELOPMENT_FORCE_RTL, value ? "1" : "0");
+        LocalePicker.updateLocale(getActivity().getResources().getConfiguration().locale);
+    }
+
+    private void updateWifiDisplayCertificationOptions() {
+        updateCheckBox(mWifiDisplayCertification, Settings.Global.getInt(
+                getActivity().getContentResolver(),
+                Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, 0) != 0);
+    }
+
+    private void writeWifiDisplayCertificationOptions() {
+        Settings.Global.putInt(getActivity().getContentResolver(),
+                Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON,
+                mWifiDisplayCertification.isChecked() ? 1 : 0);
+    }
+
     private void updateCpuUsageOptions() {
         updateCheckBox(mShowCpuUsage, Settings.Global.getInt(getActivity().getContentResolver(),
                 Settings.Global.SHOW_PROCESSES, 0) != 0);
     }
-    
+
     private void writeCpuUsageOptions() {
         boolean value = mShowCpuUsage.isChecked();
         Settings.Global.putInt(getActivity().getContentResolver(),
@@ -999,21 +1115,6 @@ public class DevelopmentSettings extends PreferenceFragment
             getActivity().getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0);
     }
 
-    private void writeExperimentalWebViewOptions() {
-        if (mExperimentalWebView != null) {
-            SystemProperties.set(WebViewFactory.WEBVIEW_EXPERIMENTAL_PROPERTY,
-                    mExperimentalWebView.isChecked() ? "true" : null);
-            pokeSystemProperties();
-        }
-    }
-
-    private void updateExperimentalWebViewOptions() {
-        if (mExperimentalWebView != null) {
-            updateCheckBox(mExperimentalWebView, SystemProperties.getBoolean(
-                    WebViewFactory.WEBVIEW_EXPERIMENTAL_PROPERTY, false));
-        }
-    }
-
     @Override
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         if (buttonView == mEnabledSwitch) {
@@ -1056,7 +1157,6 @@ public class DevelopmentSettings extends PreferenceFragment
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-
         if (Utils.isMonkeyRunning()) {
             return false;
         }
@@ -1087,21 +1187,22 @@ public class DevelopmentSettings extends PreferenceFragment
                         .setPositiveButton(android.R.string.ok, this)
                         .setNegativeButton(android.R.string.cancel, null)
                         .show();
+        } else if (preference == mEnableTerminal) {
+            final PackageManager pm = getActivity().getPackageManager();
+            pm.setApplicationEnabledSetting(TERMINAL_APP_PACKAGE,
+                    mEnableTerminal.isChecked() ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                            : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0);
         } else if (preference == mBugreportInPower) {
             Settings.Secure.putInt(getActivity().getContentResolver(),
-                    Settings.Secure.BUGREPORT_IN_POWER_MENU, 
+                    Settings.Secure.BUGREPORT_IN_POWER_MENU,
                     mBugreportInPower.isChecked() ? 1 : 0);
         } else if (preference == mKeepScreenOn) {
             Settings.Global.putInt(getActivity().getContentResolver(),
                     Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
-                    mKeepScreenOn.isChecked() ? 
+                    mKeepScreenOn.isChecked() ?
                     (BatteryManager.BATTERY_PLUGGED_AC | BatteryManager.BATTERY_PLUGGED_USB) : 0);
-        } else if (preference == mEnforceReadExternal) {
-            if (mEnforceReadExternal.isChecked()) {
-                ConfirmEnforceFragment.show(this);
-            } else {
-                setPermissionEnforced(getActivity(), READ_EXTERNAL_STORAGE, false);
-            }
+        } else if (preference == mBtHciSnoopLog) {
+            writeBtHciSnoopLogOptions();
         } else if (preference == mAllowMockLocation) {
             Settings.Secure.putInt(getActivity().getContentResolver(),
                     Settings.Secure.ALLOW_MOCK_LOCATION,
@@ -1128,8 +1229,6 @@ public class DevelopmentSettings extends PreferenceFragment
             writeImmediatelyDestroyActivitiesOptions();
         } else if (preference == mShowAllANRs) {
             writeShowAllANRsOptions();
-        } else if (preference == mExperimentalWebView) {
-            writeExperimentalWebViewOptions();
         } else if (preference == mForceHardwareUi) {
             writeHardwareUiOptions();
         } else if (preference == mForceMsaa) {
@@ -1138,10 +1237,14 @@ public class DevelopmentSettings extends PreferenceFragment
             writeShowHwScreenUpdatesOptions();
         } else if (preference == mShowHwLayersUpdates) {
             writeShowHwLayersUpdatesOptions();
-        } else if (preference == mShowHwOverdraw) {
-            writeShowHwOverdrawOptions();
         } else if (preference == mDebugLayout) {
             writeDebugLayoutOptions();
+        } else if (preference == mForceRtlLayout) {
+            writeForceRtlOptions();
+        } else if (preference == mWifiDisplayCertification) {
+            writeWifiDisplayCertificationOptions();
+        } else {
+            return super.onPreferenceTreeClick(preferenceScreen, preference);
         }
 
         return false;
@@ -1149,7 +1252,34 @@ public class DevelopmentSettings extends PreferenceFragment
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (HDCP_CHECKING_KEY.equals(preference.getKey())) {
+        if (SELECT_RUNTIME_KEY.equals(preference.getKey())) {
+            final String oldRuntimeValue = VMRuntime.getRuntime().vmLibrary();
+            final String newRuntimeValue = newValue.toString();
+            if (!newRuntimeValue.equals(oldRuntimeValue)) {
+                final Context context = getActivity();
+                final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+                builder.setMessage(context.getResources().getString(R.string.select_runtime_warning_message,
+                                                                    oldRuntimeValue, newRuntimeValue));
+                builder.setPositiveButton(android.R.string.ok, new OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        SystemProperties.set(SELECT_RUNTIME_PROPERTY, newRuntimeValue);
+                        pokeSystemProperties();
+                        PowerManager pm = (PowerManager)
+                                context.getSystemService(Context.POWER_SERVICE);
+                        pm.reboot(null);
+                    }
+                });
+                builder.setNegativeButton(android.R.string.cancel, new OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        updateRuntimeValue();
+                    }
+                });
+                builder.show();
+            }
+            return true;
+        } else if (HDCP_CHECKING_KEY.equals(preference.getKey())) {
             SystemProperties.set(HDCP_CHECKING_PROPERTY, newValue.toString());
             updateHdcpValues();
             pokeSystemProperties();
@@ -1172,6 +1302,9 @@ public class DevelopmentSettings extends PreferenceFragment
         } else if (preference == mTrackFrameTime) {
             writeTrackFrameTimeOptions(newValue);
             return true;
+        } else if (preference == mDebugHwOverdraw) {
+            writeDebugHwOverdrawOptions(newValue);
+            return true;
         } else if (preference == mShowNonRectClip) {
             writeShowNonRectClipOptions(newValue);
             return true;
@@ -1279,7 +1412,7 @@ public class DevelopmentSettings extends PreferenceFragment
                         obj.transact(IBinder.SYSPROPS_TRANSACTION, data, null, 0);
                     } catch (RemoteException e) {
                     } catch (Exception e) {
-                        Log.i(TAG, "Somone wrote a bad service '" + service
+                        Log.i(TAG, "Someone wrote a bad service '" + service
                                 + "' that doesn't like to be poked: " + e);
                     }
                     data.recycle();
@@ -1289,58 +1422,11 @@ public class DevelopmentSettings extends PreferenceFragment
         }
     }
 
-    /**
-     * Dialog to confirm enforcement of {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}.
-     */
-    public static class ConfirmEnforceFragment extends DialogFragment {
-        public static void show(DevelopmentSettings parent) {
-            final ConfirmEnforceFragment dialog = new ConfirmEnforceFragment();
-            dialog.setTargetFragment(parent, 0);
-            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_ENFORCE);
-        }
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            final Context context = getActivity();
-
-            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
-            builder.setTitle(R.string.enforce_read_external_confirm_title);
-            builder.setMessage(R.string.enforce_read_external_confirm_message);
-
-            builder.setPositiveButton(android.R.string.ok, new OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    setPermissionEnforced(context, READ_EXTERNAL_STORAGE, true);
-                    ((DevelopmentSettings) getTargetFragment()).updateAllOptions();
-                }
-            });
-            builder.setNegativeButton(android.R.string.cancel, new OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    ((DevelopmentSettings) getTargetFragment()).updateAllOptions();
-                }
-            });
-
-            return builder.create();
-        }
-    }
-
-    private static boolean isPermissionEnforced(String permission) {
+    private static boolean isPackageInstalled(Context context, String packageName) {
         try {
-            return ActivityThread.getPackageManager().isPermissionEnforced(permission);
-        } catch (RemoteException e) {
-            throw new RuntimeException("Problem talking with PackageManager", e);
-        }
-    }
-
-    private static void setPermissionEnforced(
-            Context context, String permission, boolean enforced) {
-        try {
-            // TODO: offload to background thread
-            ActivityThread.getPackageManager()
-                    .setPermissionEnforced(READ_EXTERNAL_STORAGE, enforced);
-        } catch (RemoteException e) {
-            throw new RuntimeException("Problem talking with PackageManager", e);
+            return context.getPackageManager().getPackageInfo(packageName, 0) != null;
+        } catch (NameNotFoundException e) {
+            return false;
         }
     }
 }
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index ac74221e5d3..7e947415bc1 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -37,7 +37,7 @@ import java.io.IOException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class DeviceInfoSettings extends SettingsPreferenceFragment {
+public class DeviceInfoSettings extends RestrictedSettingsFragment {
 
     private static final String LOG_TAG = "DeviceInfoSettings";
 
@@ -70,12 +70,20 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment {
     int mDevHitCountdown;
     Toast mDevHitToast;
 
+    public DeviceInfoSettings() {
+        super(null /* Don't PIN protect the entire screen */);
+    }
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
         addPreferencesFromResource(R.xml.device_info_settings);
 
+        // We only call ensurePinRestrictedPreference() when mDevHitCountdown == 0.
+        // This will keep us from entering developer mode without a PIN.
+        protectByRestrictions(KEY_BUILD_NUMBER);
+
         setStringSummary(KEY_FIRMWARE_VERSION, Build.VERSION.RELEASE);
         findPreference(KEY_FIRMWARE_VERSION).setEnabled(true);
         setValueSummary(KEY_BASEBAND_VERSION, "gsm.version.baseband");
@@ -178,6 +186,11 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment {
             if (UserHandle.myUserId() != UserHandle.USER_OWNER) return true;
 
             if (mDevHitCountdown > 0) {
+                if (mDevHitCountdown == 1) {
+                    if (super.ensurePinRestrictedPreference(preference)) {
+                        return true;
+                    }
+                }
                 mDevHitCountdown--;
                 if (mDevHitCountdown == 0) {
                     getActivity().getSharedPreferences(DevelopmentSettings.PREF_FILE,
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index e59b0bff655..813923ddc8e 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -95,9 +95,11 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
 
         mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);
         mAccelerometer.setPersistent(false);
-        if (RotationPolicy.isRotationLockToggleSupported(getActivity())) {
+        if (!RotationPolicy.isRotationSupported(getActivity())
+                || RotationPolicy.isRotationLockToggleSupported(getActivity())) {
             // If rotation lock is supported, then we do not provide this option in
-            // Display settings.  However, is still available in Accessibility settings.
+            // Display settings.  However, is still available in Accessibility settings,
+            // if the device supports rotation.
             getPreferenceScreen().removePreference(mAccelerometer);
         }
 
@@ -191,13 +193,18 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
             }
         }
         if (revisedEntries.size() != entries.length || revisedValues.size() != values.length) {
+            final int userPreference = Integer.parseInt(screenTimeoutPreference.getValue());
             screenTimeoutPreference.setEntries(
                     revisedEntries.toArray(new CharSequence[revisedEntries.size()]));
             screenTimeoutPreference.setEntryValues(
                     revisedValues.toArray(new CharSequence[revisedValues.size()]));
-            final int userPreference = Integer.parseInt(screenTimeoutPreference.getValue());
             if (userPreference <= maxTimeout) {
                 screenTimeoutPreference.setValue(String.valueOf(userPreference));
+            } else if (revisedValues.size() > 0
+                    && Long.parseLong(revisedValues.get(revisedValues.size() - 1).toString())
+                    == maxTimeout) {
+                // If the last one happens to be the same as the max timeout, select that
+                screenTimeoutPreference.setValue(String.valueOf(maxTimeout));
             } else {
                 // There will be no highlighted selection since nothing in the list matches
                 // maxTimeout. The user can still select anything less than maxTimeout.
diff --git a/src/com/android/settings/EventLogTags.logtags b/src/com/android/settings/EventLogTags.logtags
new file mode 100644
index 00000000000..3e87c536961
--- /dev/null
+++ b/src/com/android/settings/EventLogTags.logtags
@@ -0,0 +1,6 @@
+# See system/core/logcat/event.logtags for a description of the format of this file.
+
+option java_package com.android.settings
+
+# log the type of screen lock when user sets lock screen
+90200 lock_screen_type (type|3)
diff --git a/src/com/android/settings/HelpUtils.java b/src/com/android/settings/HelpUtils.java
index 6cd5eb65c8e..22e2f7620a8 100644
--- a/src/com/android/settings/HelpUtils.java
+++ b/src/com/android/settings/HelpUtils.java
@@ -16,6 +16,7 @@
 
 package com.android.settings;
 
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
@@ -95,9 +96,15 @@ public class HelpUtils {
 
             // Set the intent to the help menu item, show the help menu item in the overflow
             // menu, and make it visible.
-            helpMenuItem.setIntent(intent);
-            helpMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-            helpMenuItem.setVisible(true);
+            ComponentName component = intent.resolveActivity(context.getPackageManager());
+            if (component != null) {
+                helpMenuItem.setIntent(intent);
+                helpMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+                helpMenuItem.setVisible(true);
+            } else {
+                helpMenuItem.setVisible(false);
+                return false;
+            }
 
             // return that the help menu item is visible (i.e., true)
             return true;
@@ -109,7 +116,7 @@ public class HelpUtils {
      * of the app's package as gotten via the context.
      * @return the uri with added query parameters
      */
-    private static Uri uriWithAddedParameters(Context context, Uri baseUri) {
+    public static Uri uriWithAddedParameters(Context context, Uri baseUri) {
         Uri.Builder builder = baseUri.buildUpon();
 
         // Add in the preferred language
diff --git a/src/com/android/settings/HomeSettings.java b/src/com/android/settings/HomeSettings.java
new file mode 100644
index 00000000000..eb659e27e1d
--- /dev/null
+++ b/src/com/android/settings/HomeSettings.java
@@ -0,0 +1,293 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import java.util.ArrayList;
+
+import android.app.ActivityManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.graphics.ColorFilter;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.preference.Preference;
+import android.preference.PreferenceGroup;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ImageView;
+import android.widget.RadioButton;
+
+public class HomeSettings extends SettingsPreferenceFragment {
+    static final String TAG = "HomeSettings";
+
+    static final int REQUESTING_UNINSTALL = 10;
+
+    public static final String HOME_PREFS = "home_prefs";
+    public static final String HOME_PREFS_DO_SHOW = "do_show";
+
+    public static final String HOME_SHOW_NOTICE = "show";
+
+    PreferenceGroup mPrefGroup;
+
+    PackageManager mPm;
+    ComponentName[] mHomeComponentSet;
+    ArrayList<HomeAppPreference> mPrefs;
+    HomeAppPreference mCurrentHome = null;
+    final IntentFilter mHomeFilter;
+    boolean mShowNotice;
+
+    public HomeSettings() {
+        mHomeFilter = new IntentFilter(Intent.ACTION_MAIN);
+        mHomeFilter.addCategory(Intent.CATEGORY_HOME);
+        mHomeFilter.addCategory(Intent.CATEGORY_DEFAULT);
+    }
+
+    OnClickListener mHomeClickListener = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            int index = (Integer)v.getTag();
+            HomeAppPreference pref = mPrefs.get(index);
+            if (!pref.isChecked) {
+                makeCurrentHome(pref);
+            }
+        }
+    };
+
+    OnClickListener mDeleteClickListener = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            int index = (Integer)v.getTag();
+            uninstallApp(mPrefs.get(index));
+        }
+    };
+
+    void makeCurrentHome(HomeAppPreference newHome) {
+        if (mCurrentHome != null) {
+            mCurrentHome.setChecked(false);
+        }
+        newHome.setChecked(true);
+        mCurrentHome = newHome;
+
+        mPm.replacePreferredActivity(mHomeFilter, IntentFilter.MATCH_CATEGORY_EMPTY,
+                mHomeComponentSet, newHome.activityName);
+    }
+
+    void uninstallApp(HomeAppPreference pref) {
+        // Uninstallation is done by asking the OS to do it
+       Uri packageURI = Uri.parse("package:" + pref.uninstallTarget);
+       Intent uninstallIntent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageURI);
+       uninstallIntent.putExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, false);
+       int requestCode = REQUESTING_UNINSTALL + (pref.isChecked ? 1 : 0);
+       startActivityForResult(uninstallIntent, requestCode);
+   }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        // Rebuild the list now that we might have nuked something
+        buildHomeActivitiesList();
+
+        // if the previous home app is now gone, fall back to the system one
+        if (requestCode > REQUESTING_UNINSTALL) {
+            // if mCurrentHome has gone null, it means we didn't find the previously-
+            // default home app when rebuilding the list, i.e. it was the one we
+            // just uninstalled.  When that happens we make the system-bundled
+            // home app the active default.
+            if (mCurrentHome == null) {
+                for (int i = 0; i < mPrefs.size(); i++) {
+                    HomeAppPreference pref = mPrefs.get(i);
+                    if (pref.isSystem) {
+                        makeCurrentHome(pref);
+                        break;
+                    }
+                }
+            }
+        }
+
+        // If we're down to just one possible home app, back out of this settings
+        // fragment and show a dialog explaining to the user that they won't see
+        // 'Home' settings now until such time as there are multiple available.
+        if (mPrefs.size() < 2) {
+            if (mShowNotice) {
+                mShowNotice = false;
+                Settings.requestHomeNotice();
+            }
+            finishFragment();
+        }
+    }
+
+    void buildHomeActivitiesList() {
+        ArrayList<ResolveInfo> homeActivities = new ArrayList<ResolveInfo>();
+        ComponentName currentDefaultHome  = mPm.getHomeActivities(homeActivities);
+
+        Context context = getActivity();
+        mCurrentHome = null;
+        mPrefGroup.removeAll();
+        mPrefs = new ArrayList<HomeAppPreference>();
+        mHomeComponentSet = new ComponentName[homeActivities.size()];
+        int prefIndex = 0;
+        for (int i = 0; i < homeActivities.size(); i++) {
+            final ResolveInfo candidate = homeActivities.get(i);
+            final ActivityInfo info = candidate.activityInfo;
+            ComponentName activityName = new ComponentName(info.packageName, info.name);
+            mHomeComponentSet[i] = activityName;
+            try {
+                Drawable icon = info.loadIcon(mPm);
+                CharSequence name = info.loadLabel(mPm);
+                HomeAppPreference pref = new HomeAppPreference(context, activityName, prefIndex,
+                        icon, name, this, info);
+                mPrefs.add(pref);
+                mPrefGroup.addPreference(pref);
+                pref.setEnabled(true);
+                if (activityName.equals(currentDefaultHome)) {
+                    mCurrentHome = pref;
+                }
+                prefIndex++;
+            } catch (Exception e) {
+                Log.v(TAG, "Problem dealing with activity " + activityName, e);
+            }
+        }
+
+        if (mCurrentHome != null) {
+            new Handler().post(new Runnable() {
+               public void run() {
+                   mCurrentHome.setChecked(true);
+               }
+            });
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.home_selection);
+
+        mPm = getPackageManager();
+        mPrefGroup = (PreferenceGroup) findPreference("home");
+
+        Bundle args = getArguments();
+        mShowNotice = (args != null) && args.getBoolean(HOME_SHOW_NOTICE, false);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        buildHomeActivitiesList();
+    }
+
+    class HomeAppPreference extends Preference {
+        ComponentName activityName;
+        int index;
+        HomeSettings fragment;
+        final ColorFilter grayscaleFilter;
+        boolean isChecked;
+
+        boolean isSystem;
+        String uninstallTarget;
+
+        public HomeAppPreference(Context context, ComponentName activity,
+                int i, Drawable icon, CharSequence title,
+                HomeSettings parent, ActivityInfo info) {
+            super(context);
+            setLayoutResource(R.layout.preference_home_app);
+            setIcon(icon);
+            setTitle(title);
+            activityName = activity;
+            fragment = parent;
+            index = i;
+
+            ColorMatrix colorMatrix = new ColorMatrix();
+            colorMatrix.setSaturation(0f);
+            float[] matrix = colorMatrix.getArray();
+            matrix[18] = 0.5f;
+            grayscaleFilter = new ColorMatrixColorFilter(colorMatrix);
+
+            determineTargets(info);
+        }
+
+        // Check whether this activity is bundled on the system, with awareness
+        // of the META_HOME_ALTERNATE mechanism.
+        private void determineTargets(ActivityInfo info) {
+            final Bundle meta = info.metaData;
+            if (meta != null) {
+                final String altHomePackage = meta.getString(ActivityManager.META_HOME_ALTERNATE);
+                if (altHomePackage != null) {
+                    try {
+                        final int match = mPm.checkSignatures(info.packageName, altHomePackage);
+                        if (match >= PackageManager.SIGNATURE_MATCH) {
+                            PackageInfo altInfo = mPm.getPackageInfo(altHomePackage, 0);
+                            final int altFlags = altInfo.applicationInfo.flags;
+                            isSystem = (altFlags & ApplicationInfo.FLAG_SYSTEM) != 0;
+                            uninstallTarget = altInfo.packageName;
+                            return;
+                        }
+                    } catch (Exception e) {
+                        // e.g. named alternate package not found during lookup
+                        Log.w(TAG, "Unable to compare/resolve alternate", e);
+                    }
+                }
+            }
+            // No suitable metadata redirect, so use the package's own info
+            isSystem = (info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
+            uninstallTarget = info.packageName;
+        }
+
+        @Override
+        protected void onBindView(View view) {
+            super.onBindView(view);
+
+            RadioButton radio = (RadioButton) view.findViewById(R.id.home_radio);
+            radio.setChecked(isChecked);
+
+            Integer indexObj = new Integer(index);
+
+            ImageView icon = (ImageView) view.findViewById(R.id.home_app_uninstall);
+            if (isSystem) {
+                icon.setEnabled(false);
+                icon.setColorFilter(grayscaleFilter);
+            } else {
+                icon.setOnClickListener(mDeleteClickListener);
+                icon.setTag(indexObj);
+            }
+
+            View v = view.findViewById(R.id.home_app_pref);
+            v.setOnClickListener(mHomeClickListener);
+            v.setTag(indexObj);
+        }
+
+        void setChecked(boolean state) {
+            if (state != isChecked) {
+                isChecked = state;
+                notifyChanged();
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/KeyguardAppWidgetPickActivity.java b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
index 8e08019ba6b..f3db2caa653 100644
--- a/src/com/android/settings/KeyguardAppWidgetPickActivity.java
+++ b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
@@ -517,8 +517,8 @@ public class KeyguardAppWidgetPickActivity extends Activity
                     // Found in KeyguardHostView.java
                     final int KEYGUARD_HOST_ID = 0x4B455947;
                     int userId = ActivityManager.getCurrentUser();
-                    mAppWidgetId = AppWidgetHost.allocateAppWidgetIdForSystem(KEYGUARD_HOST_ID,
-                            userId);
+                    mAppWidgetId = AppWidgetHost.allocateAppWidgetIdForPackage(KEYGUARD_HOST_ID,
+                            userId, "com.android.keyguard");
                 }
                 mAppWidgetManager.bindAppWidgetId(
                         mAppWidgetId, intent.getComponent(), mExtraConfigureOptions);
diff --git a/src/com/android/settings/LocationSettings.java b/src/com/android/settings/LocationSettings.java
deleted file mode 100644
index 2edefdfba1f..00000000000
--- a/src/com/android/settings/LocationSettings.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-
-import android.content.ContentQueryMap;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.location.LocationManager;
-import android.os.UserManager;
-import android.preference.CheckBoxPreference;
-import android.preference.Preference;
-import android.preference.PreferenceScreen;
-import android.preference.SwitchPreference;
-import android.provider.Settings;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.TextView;
-
-import java.util.Observable;
-import java.util.Observer;
-
-/**
- * Gesture lock pattern settings.
- */
-public class LocationSettings extends SettingsPreferenceFragment
-        implements Preference.OnPreferenceChangeListener {
-
-    // Location Settings
-    private static final String KEY_LOCATION_TOGGLE = "location_toggle";
-    private static final String KEY_LOCATION_NETWORK = "location_network";
-    private static final String KEY_LOCATION_GPS = "location_gps";
-    private static final String KEY_ASSISTED_GPS = "assisted_gps";
-
-    private CheckBoxPreference mNetwork;
-    private CheckBoxPreference mGps;
-    private CheckBoxPreference mAssistedGps;
-    private SwitchPreference mLocationAccess;
-
-    // These provide support for receiving notification when Location Manager settings change.
-    // This is necessary because the Network Location Provider can change settings
-    // if the user does not confirm enabling the provider.
-    private ContentQueryMap mContentQueryMap;
-
-    private Observer mSettingsObserver;
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        // listen for Location Manager settings changes
-        Cursor settingsCursor = getContentResolver().query(Settings.Secure.CONTENT_URI, null,
-                "(" + Settings.System.NAME + "=?)",
-                new String[]{Settings.Secure.LOCATION_PROVIDERS_ALLOWED},
-                null);
-        mContentQueryMap = new ContentQueryMap(settingsCursor, Settings.System.NAME, true, null);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        if (mSettingsObserver != null) {
-            mContentQueryMap.deleteObserver(mSettingsObserver);
-        }
-        mContentQueryMap.close();
-    }
-
-    private PreferenceScreen createPreferenceHierarchy() {
-        PreferenceScreen root = getPreferenceScreen();
-        if (root != null) {
-            root.removeAll();
-        }
-        addPreferencesFromResource(R.xml.location_settings);
-        root = getPreferenceScreen();
-
-        mLocationAccess = (SwitchPreference) root.findPreference(KEY_LOCATION_TOGGLE);
-        mNetwork = (CheckBoxPreference) root.findPreference(KEY_LOCATION_NETWORK);
-        mGps = (CheckBoxPreference) root.findPreference(KEY_LOCATION_GPS);
-        mAssistedGps = (CheckBoxPreference) root.findPreference(KEY_ASSISTED_GPS);
-
-        // Only enable these controls if this user is allowed to change location
-        // sharing settings.
-        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
-        boolean isToggleAllowed = !um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION);
-        if (mLocationAccess != null) mLocationAccess.setEnabled(isToggleAllowed);
-        if (mNetwork != null) mNetwork.setEnabled(isToggleAllowed);
-        if (mGps != null) mGps.setEnabled(isToggleAllowed);
-        if (mAssistedGps != null) mAssistedGps.setEnabled(isToggleAllowed);
-
-        mLocationAccess.setOnPreferenceChangeListener(this);
-        return root;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        // Make sure we reload the preference hierarchy since some of these settings
-        // depend on others...
-        createPreferenceHierarchy();
-        updateLocationToggles();
-
-        if (mSettingsObserver == null) {
-            mSettingsObserver = new Observer() {
-                @Override
-                public void update(Observable o, Object arg) {
-                    updateLocationToggles();
-                }
-            };
-        }
-
-        mContentQueryMap.addObserver(mSettingsObserver);
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        final ContentResolver cr = getContentResolver();
-        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
-        if (preference == mNetwork) {
-            if (!um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {
-                Settings.Secure.setLocationProviderEnabled(cr,
-                        LocationManager.NETWORK_PROVIDER, mNetwork.isChecked());
-            }
-        } else if (preference == mGps) {
-            boolean enabled = mGps.isChecked();
-            if (!um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {
-                Settings.Secure.setLocationProviderEnabled(cr,
-                        LocationManager.GPS_PROVIDER, enabled);
-                if (mAssistedGps != null) {
-                    mAssistedGps.setEnabled(enabled);
-                }
-            }
-        } else if (preference == mAssistedGps) {
-            Settings.Global.putInt(cr, Settings.Global.ASSISTED_GPS_ENABLED,
-                    mAssistedGps.isChecked() ? 1 : 0);
-        } else {
-            // If we didn't handle it, let preferences handle it.
-            return super.onPreferenceTreeClick(preferenceScreen, preference);
-        }
-
-        return true;
-    }
-
-    /*
-     * Creates toggles for each available location provider
-     */
-    private void updateLocationToggles() {
-        ContentResolver res = getContentResolver();
-        boolean gpsEnabled = Settings.Secure.isLocationProviderEnabled(
-                res, LocationManager.GPS_PROVIDER);
-        boolean networkEnabled = Settings.Secure.isLocationProviderEnabled(
-                res, LocationManager.NETWORK_PROVIDER);
-        mGps.setChecked(gpsEnabled);
-        mNetwork.setChecked(networkEnabled);
-        mLocationAccess.setChecked(gpsEnabled || networkEnabled);
-        if (mAssistedGps != null) {
-            mAssistedGps.setChecked(Settings.Global.getInt(res,
-                    Settings.Global.ASSISTED_GPS_ENABLED, 2) == 1);
-            mAssistedGps.setEnabled(gpsEnabled);
-        }
-    }
-
-    /**
-     * see confirmPatternThenDisableAndClear
-     */
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        createPreferenceHierarchy();
-    }
-
-    /** Enable or disable all providers when the master toggle is changed. */
-    private void onToggleLocationAccess(boolean checked) {
-        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
-        if (um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {
-            return;
-        }
-        final ContentResolver cr = getContentResolver();
-        Settings.Secure.setLocationProviderEnabled(cr,
-                LocationManager.GPS_PROVIDER, checked);
-        Settings.Secure.setLocationProviderEnabled(cr,
-                LocationManager.NETWORK_PROVIDER, checked);
-        updateLocationToggles();
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference pref, Object newValue) {
-        if (pref.getKey().equals(KEY_LOCATION_TOGGLE)) {
-            onToggleLocationAccess((Boolean) newValue);
-        }
-        return true;
-    }
-
-    @Override
-    public int getHelpResource() {
-        return R.string.help_url_location_access;
-    }
-}
-
-class WrappingSwitchPreference extends SwitchPreference {
-
-    public WrappingSwitchPreference(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    public WrappingSwitchPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    protected void onBindView(View view) {
-        super.onBindView(view);
-
-        TextView title = (TextView) view.findViewById(android.R.id.title);
-        if (title != null) {
-            title.setSingleLine(false);
-            title.setMaxLines(3);
-        }
-    }
-}
-
-class WrappingCheckBoxPreference extends CheckBoxPreference {
-
-    public WrappingCheckBoxPreference(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    public WrappingCheckBoxPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    protected void onBindView(View view) {
-        super.onBindView(view);
-
-        TextView title = (TextView) view.findViewById(android.R.id.title);
-        if (title != null) {
-            title.setSingleLine(false);
-            title.setMaxLines(3);
-        }
-    }
-}
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 495f3fd57a2..262aca37e78 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -29,6 +29,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.SystemProperties;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.util.Log;
@@ -54,6 +55,7 @@ public class MasterClear extends Fragment {
     private static final String TAG = "MasterClear";
 
     private static final int KEYGUARD_REQUEST = 55;
+    private static final int PIN_REQUEST = 56;
 
     static final String ERASE_EXTERNAL_EXTRA = "erase_sd";
 
@@ -61,6 +63,7 @@ public class MasterClear extends Fragment {
     private Button mInitiateButton;
     private View mExternalStorageContainer;
     private CheckBox mExternalStorage;
+    private boolean mPinConfirmed;
 
     /**
      * Keyguard validation is run using the standard {@link ConfirmLockPattern}
@@ -76,11 +79,25 @@ public class MasterClear extends Fragment {
                         res.getText(R.string.master_clear_gesture_explanation));
     }
 
+    private boolean runRestrictionsChallenge() {
+        if (UserManager.get(getActivity()).hasRestrictionsChallenge()) {
+            startActivityForResult(
+                    new Intent(Intent.ACTION_RESTRICTIONS_CHALLENGE), PIN_REQUEST);
+            return true;
+        }
+        return false;
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if (requestCode != KEYGUARD_REQUEST) {
+        if (requestCode == PIN_REQUEST) {
+            if (resultCode == Activity.RESULT_OK) {
+                mPinConfirmed = true;
+            }
+            return;
+        } else if (requestCode != KEYGUARD_REQUEST) {
             return;
         }
 
@@ -109,6 +126,10 @@ public class MasterClear extends Fragment {
     private final Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
 
         public void onClick(View v) {
+            mPinConfirmed = false;
+            if (runRestrictionsChallenge()) {
+                return;
+            }
             if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
                 showFinalConfirmation();
             }
@@ -239,4 +260,17 @@ public class MasterClear extends Fragment {
         establishInitialState();
         return mContentView;
     }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // If this is the second step after restrictions pin challenge
+        if (mPinConfirmed) {
+            mPinConfirmed = false;
+            if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
+                showFinalConfirmation();
+            }
+        }
+    }
 }
diff --git a/src/com/android/settings/MonitoringCertInfoActivity.java b/src/com/android/settings/MonitoringCertInfoActivity.java
new file mode 100644
index 00000000000..e2ac5d072b8
--- /dev/null
+++ b/src/com/android/settings/MonitoringCertInfoActivity.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.view.WindowManager;
+import android.view.WindowManagerGlobal;
+
+/**
+ * Activity that shows a dialog explaining that a CA cert is allowing someone to monitor network
+ * traffic.
+ */
+public class MonitoringCertInfoActivity extends Activity implements OnClickListener {
+
+    private boolean hasDeviceOwner = false;
+
+    @Override
+    protected void onCreate(Bundle savedStates) {
+        super.onCreate(savedStates);
+
+        DevicePolicyManager dpm =
+                (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+
+        final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.ssl_ca_cert_dialog_title);
+        builder.setCancelable(true);
+        hasDeviceOwner = dpm.getDeviceOwner() != null;
+        int buttonLabel;
+        if (hasDeviceOwner) {
+            // Institutional case.  Show informational message.
+            String message = this.getResources().getString(R.string.ssl_ca_cert_info_message,
+                    dpm.getDeviceOwnerName());
+            builder.setMessage(message);
+            buttonLabel = R.string.done_button;
+        } else {
+            // Consumer case.  Show scary warning.
+            builder.setIcon(android.R.drawable.stat_notify_error);
+            builder.setMessage(R.string.ssl_ca_cert_warning_message);
+            buttonLabel = R.string.ssl_ca_cert_settings_button;
+        }
+
+        builder.setPositiveButton(buttonLabel, this);
+
+        final Dialog dialog = builder.create();
+        dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
+        try {
+            WindowManagerGlobal.getWindowManagerService().dismissKeyguard();
+        } catch (RemoteException e) {
+        }
+        dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+            @Override public void onCancel(DialogInterface dialog) {
+                finish();
+            }
+        });
+
+        dialog.show();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        if (hasDeviceOwner) {
+            finish();
+        } else {
+            Intent intent =
+                    new Intent(android.provider.Settings.ACTION_TRUSTED_CREDENTIALS_USER);
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            startActivity(intent);
+            finish();
+        }
+    }
+}
diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.java b/src/com/android/settings/RegulatoryInfoDisplayActivity.java
index 8adecf10b2f..171059c2978 100644
--- a/src/com/android/settings/RegulatoryInfoDisplayActivity.java
+++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.java
@@ -22,7 +22,11 @@ import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.os.SystemProperties;
+import android.text.TextUtils;
 import android.view.Gravity;
+import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 /**
@@ -30,11 +34,14 @@ import android.widget.TextView;
  * preference item, and when "*#07#" is dialed on the Phone keypad. To enable this feature,
  * set the "config_show_regulatory_info" boolean to true in a device overlay resource, and in the
  * same overlay, either add a drawable named "regulatory_info.png" containing a graphical version
- * of the required regulatory info, or add a string resource named "regulatory_info_text" with
- * an HTML version of the required information (text will be centered in the dialog).
+ * of the required regulatory info (If ro.bootloader.hardware.sku property is set use
+ * "regulatory_info_<sku>.png where sku is ro.bootloader.hardware.sku property value in lowercase"),
+ * or add a string resource named "regulatory_info_text" with an HTML version of the required
+ * information (text will be centered in the dialog).
  */
 public class RegulatoryInfoDisplayActivity extends Activity implements
         DialogInterface.OnDismissListener {
+    private final String REGULATORY_INFO_RESOURCE = "regulatory_info";
 
     /**
      * Display the regulatory info graphic in a dialog window.
@@ -52,21 +59,27 @@ public class RegulatoryInfoDisplayActivity extends Activity implements
                 .setTitle(R.string.regulatory_information)
                 .setOnDismissListener(this);
 
-        boolean regulatoryInfoDrawableExists;
-        try {
-            Drawable d = resources.getDrawable(R.drawable.regulatory_info);
-            // set to false if the width or height is <= 2
-            // (missing PNG can return an empty 2x2 pixel Drawable)
-            regulatoryInfoDrawableExists = (d.getIntrinsicWidth() > 2
-                    && d.getIntrinsicHeight() > 2);
-        } catch (Resources.NotFoundException ignored) {
-            regulatoryInfoDrawableExists = false;
+        boolean regulatoryInfoDrawableExists = false;
+        int resId = getResourceId();
+        if (resId != 0) {
+            try {
+                Drawable d = resources.getDrawable(resId);
+                // set to false if the width or height is <= 2
+                // (missing PNG can return an empty 2x2 pixel Drawable)
+                regulatoryInfoDrawableExists = (d.getIntrinsicWidth() > 2
+                        && d.getIntrinsicHeight() > 2);
+            } catch (Resources.NotFoundException ignored) {
+                regulatoryInfoDrawableExists = false;
+            }
         }
 
         CharSequence regulatoryText = resources.getText(R.string.regulatory_info_text);
 
         if (regulatoryInfoDrawableExists) {
-            builder.setView(getLayoutInflater().inflate(R.layout.regulatory_info, null));
+            View view = getLayoutInflater().inflate(R.layout.regulatory_info, null);
+            ImageView image = (ImageView) view.findViewById(R.id.regulatoryInfo);
+            image.setImageResource(resId);
+            builder.setView(view);
             builder.show();
         } else if (regulatoryText.length() > 0) {
             builder.setMessage(regulatoryText);
@@ -80,6 +93,24 @@ public class RegulatoryInfoDisplayActivity extends Activity implements
         }
     }
 
+    private int getResourceId() {
+        // Use regulatory_info by default.
+        int resId = getResources().getIdentifier(
+                REGULATORY_INFO_RESOURCE, "drawable", getPackageName());
+
+        // When hardware sku property exists, use regulatory_info_<sku> resource if valid.
+        String sku = SystemProperties.get("ro.boot.hardware.sku", "");
+        if (!TextUtils.isEmpty(sku)) {
+            String regulatory_info_res = REGULATORY_INFO_RESOURCE + "_" + sku.toLowerCase();
+            int id = getResources().getIdentifier(
+                    regulatory_info_res, "drawable", getPackageName());
+            if (id != 0) {
+                resId = id;
+            }
+        }
+        return resId;
+    }
+
     @Override
     public void onDismiss(DialogInterface dialog) {
         finish();   // close the activity
diff --git a/src/com/android/settings/RestrictedSettingsFragment.java b/src/com/android/settings/RestrictedSettingsFragment.java
new file mode 100644
index 00000000000..34eda1e6a3f
--- /dev/null
+++ b/src/com/android/settings/RestrictedSettingsFragment.java
@@ -0,0 +1,261 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import java.util.HashSet;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.os.UserManager;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+
+/**
+ * Base class for settings activities that should be pin protected when in restricted mode.
+ * The constructor for this class will take the restriction key that this screen should be
+ * locked by.  If {@link UserManager.hasRestrictionsPin()} and
+ * {@link UserManager.hasUserRestriction(String)} returns true for the restriction key, then
+ * the user will have to enter the restrictions pin before seeing the Settings screen.
+ *
+ * If this settings screen should be pin protected whenever
+ * {@link UserManager.hasUserRestriction(String)} returns true, pass in
+ * {@link RESTRICTIONS_PIN_SET} to the constructor instead of a restrictions key.
+ */
+public class RestrictedSettingsFragment extends SettingsPreferenceFragment {
+
+    protected static final String RESTRICTIONS_PIN_SET = "restrictions_pin_set";
+
+    private static final String EXTRA_PREFERENCE = "pref";
+    private static final String EXTRA_CHECKBOX_STATE = "isChecked";
+    // Should be unique across all settings screens that use this.
+    private static final int REQUEST_PIN_CHALLENGE = 12309;
+
+    private static final String KEY_CHALLENGE_SUCCEEDED = "chsc";
+    private static final String KEY_CHALLENGE_REQUESTED = "chrq";
+    private static final String KEY_RESUME_ACTION_BUNDLE = "rsmb";
+
+    // If the restriction PIN is entered correctly.
+    private boolean mChallengeSucceeded;
+    private boolean mChallengeRequested;
+    private Bundle mResumeActionBundle;
+
+    private UserManager mUserManager;
+
+    private final String mRestrictionKey;
+
+    private final HashSet<Preference> mProtectedByRestictionsPrefs = new HashSet<Preference>();
+
+    // Receiver to clear pin status when the screen is turned off.
+    private BroadcastReceiver mScreenOffReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            mChallengeSucceeded = false;
+            if (shouldBePinProtected(mRestrictionKey)) {
+                ensurePin(null);
+            }
+        }
+    };
+
+    /**
+     * @param restrictionKey The restriction key to check before pin protecting
+     *            this settings page. Pass in {@link RESTRICTIONS_PIN_SET} if it should
+     *            be PIN protected whenever a restrictions pin is set. Pass in
+     *            null if it should never be PIN protected.
+     */
+    public RestrictedSettingsFragment(String restrictionKey) {
+        mRestrictionKey = restrictionKey;
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mUserManager = (UserManager) getSystemService(Context.USER_SERVICE);
+
+        if (icicle != null) {
+            mChallengeSucceeded = icicle.getBoolean(KEY_CHALLENGE_SUCCEEDED, false);
+            mChallengeRequested = icicle.getBoolean(KEY_CHALLENGE_REQUESTED, false);
+            mResumeActionBundle = icicle.getBundle(KEY_RESUME_ACTION_BUNDLE);
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putBoolean(KEY_CHALLENGE_REQUESTED, mChallengeRequested);
+        if (mResumeActionBundle != null) {
+            outState.putBundle(KEY_RESUME_ACTION_BUNDLE, mResumeActionBundle);
+        }
+        if (getActivity().isChangingConfigurations()) {
+            outState.putBoolean(KEY_CHALLENGE_SUCCEEDED, mChallengeSucceeded);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (shouldBePinProtected(mRestrictionKey)) {
+            ensurePin(null);
+        } else {
+            // If the whole screen is not pin protected, reset mChallengeSucceeded so next
+            // time user uses a protected preference, they are prompted for pin again.
+            mChallengeSucceeded = false;
+        }
+        IntentFilter filter = new IntentFilter(Intent.ACTION_SCREEN_OFF);
+        filter.addAction(Intent.ACTION_USER_PRESENT);
+        getActivity().registerReceiver(mScreenOffReceiver, filter);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        getActivity().unregisterReceiver(mScreenOffReceiver);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_PIN_CHALLENGE) {
+            Bundle resumeActionBundle = mResumeActionBundle;
+            mResumeActionBundle = null;
+            mChallengeRequested = false;
+            if (resultCode == Activity.RESULT_OK) {
+                mChallengeSucceeded = true;
+                String prefKey = resumeActionBundle == null ?
+                        null : resumeActionBundle.getString(EXTRA_PREFERENCE);
+                if (prefKey != null) {
+                    Preference pref = findPreference(prefKey);
+                    if (pref != null) {
+                        // Make sure the checkbox state is the same as it was when we launched the
+                        // pin challenge.
+                        if (pref instanceof CheckBoxPreference
+                                && resumeActionBundle.containsKey(EXTRA_CHECKBOX_STATE)) {
+                            boolean isChecked =
+                                    resumeActionBundle.getBoolean(EXTRA_CHECKBOX_STATE, false);
+                            ((CheckBoxPreference)pref).setChecked(isChecked);
+                        }
+                        if (!onPreferenceTreeClick(getPreferenceScreen(), pref)) {
+                            Intent prefIntent = pref.getIntent();
+                            if (prefIntent != null) {
+                                pref.getContext().startActivity(prefIntent);
+                            }
+                        }
+                    }
+                }
+            } else if (!isDetached()) {
+                finishFragment();
+            }
+            return;
+        }
+
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    private void ensurePin(Preference preference) {
+        if (!mChallengeSucceeded) {
+            final UserManager um = UserManager.get(getActivity());
+            if (!mChallengeRequested) {
+                if (um.hasRestrictionsChallenge()) {
+                    mResumeActionBundle = new Bundle();
+                    if (preference != null) {
+                        mResumeActionBundle.putString(EXTRA_PREFERENCE, preference.getKey());
+                        if (preference instanceof CheckBoxPreference) {
+                            mResumeActionBundle.putBoolean(EXTRA_CHECKBOX_STATE,
+                                    ((CheckBoxPreference)preference).isChecked());
+                        }
+                    }
+                    Intent requestPin = new Intent(Intent.ACTION_RESTRICTIONS_CHALLENGE);
+                    startActivityForResult(requestPin, REQUEST_PIN_CHALLENGE);
+                    mChallengeRequested = true;
+                }
+            }
+        }
+        mChallengeSucceeded = false;
+    }
+
+    /**
+     * Returns true if this activity is restricted, but no restriction pin has been set.
+     * Used to determine if the settings UI should disable UI.
+     */
+    protected boolean isRestrictedAndNotPinProtected() {
+        if (mRestrictionKey == null || RESTRICTIONS_PIN_SET.equals(mRestrictionKey)) {
+            return false;
+        }
+        return mUserManager.hasUserRestriction(mRestrictionKey)
+                && !mUserManager.hasRestrictionsChallenge();
+    }
+
+    /**
+     * Called to trigger the pin entry if the given restriction key is locked down.
+     * @param restrictionsKey The restriction key or {@link RESTRICTIONS_PIN_SET} if
+     *          pin entry should get triggered if there is a pin set.
+     */
+   protected boolean restrictionsPinCheck(String restrictionsKey, Preference preference) {
+       if (shouldBePinProtected(restrictionsKey) && !mChallengeSucceeded) {
+           ensurePin(preference);
+           return false;
+       } else {
+           return true;
+       }
+   }
+
+   protected boolean hasChallengeSucceeded() {
+       return mChallengeSucceeded;
+   }
+
+   /**
+    * Returns true if this restrictions key is locked down.
+    */
+   protected boolean shouldBePinProtected(String restrictionKey) {
+       if (restrictionKey == null) {
+           return false;
+       }
+       boolean restricted = RESTRICTIONS_PIN_SET.equals(restrictionKey)
+               || mUserManager.hasUserRestriction(restrictionKey);
+       return restricted && mUserManager.hasRestrictionsChallenge();
+   }
+
+   /**
+    * If the preference is one that was added by protectByRestrictions(), then it will
+    * prompt the user for the restrictions pin if they haven't entered it already.
+    * Intended to be called at the top of onPreferenceTreeClick.  If this function returns
+    * true, then onPreferenceTreeClick should return true.
+    */
+   boolean ensurePinRestrictedPreference(Preference preference) {
+       return mProtectedByRestictionsPrefs.contains(preference)
+               && !restrictionsPinCheck(RESTRICTIONS_PIN_SET, preference);
+   }
+
+    /**
+     * Call this with any preferences that should require the PIN to be entered
+     * before they are accessible.
+     */
+   protected void protectByRestrictions(Preference pref) {
+       if (pref != null) {
+           mProtectedByRestictionsPrefs.add(pref);
+       }
+   }
+
+   protected void protectByRestrictions(String key) {
+       Preference pref = findPreference(key);
+       protectByRestrictions(pref);
+   }
+}
diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 56393e0fc98..dd81ded0489 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -80,6 +80,13 @@ public class RingerVolumePreference extends VolumePreference {
         R.id.alarm_mute_button
     };
 
+    private static final int[] SEEKBAR_SECTION_ID = new int[] {
+        R.id.media_section,
+        R.id.ringer_section,
+        R.id.notification_section,
+        R.id.alarm_section
+    };
+
     private static final int[] SEEKBAR_MUTED_RES_ID = new int[] {
         com.android.internal.R.drawable.ic_audio_vol_mute,
         com.android.internal.R.drawable.ic_audio_ring_notif_mute,
@@ -198,15 +205,33 @@ public class RingerVolumePreference extends VolumePreference {
             getContext().registerReceiver(mRingModeChangedReceiver, filter);
         }
 
-        // Disable either ringer+notifications or notifications
-        int id;
-        if (!Utils.isVoiceCapable(getContext())) {
-            id = R.id.ringer_section;
+        boolean useMasterVolume = getContext().getResources().
+                getBoolean(com.android.internal.R.bool.config_useMasterVolume);
+        if (useMasterVolume) {
+            // If config_useMasterVolume is true, all streams are treated as STREAM_MASTER.
+            // So hide all except a stream.
+            int id;
+            if (Utils.isVoiceCapable(getContext())) {
+                id = R.id.ringer_section;
+            } else {
+                id = R.id.media_section;
+            }
+            for (int i = 0; i < SEEKBAR_SECTION_ID.length; i++) {
+                if (SEEKBAR_SECTION_ID[i] != id) {
+                    view.findViewById(SEEKBAR_SECTION_ID[i]).setVisibility(View.GONE);
+                }
+            }
         } else {
-            id = R.id.notification_section;
+            // Disable either ringer+notifications or notifications
+            int id;
+            if (!Utils.isVoiceCapable(getContext())) {
+                id = R.id.ringer_section;
+            } else {
+                id = R.id.notification_section;
+            }
+            View hideSection = view.findViewById(id);
+            hideSection.setVisibility(View.GONE);
         }
-        View hideSection = view.findViewById(id);
-        hideSection.setVisibility(View.GONE);
     }
 
     private Uri getMediaVolumeUri(Context context) {
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 948aded98ee..e0022649484 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -20,6 +20,7 @@ package com.android.settings;
 import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
 
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
@@ -50,9 +51,8 @@ import java.util.List;
 /**
  * Gesture lock pattern settings.
  */
-public class SecuritySettings extends SettingsPreferenceFragment
+public class SecuritySettings extends RestrictedSettingsFragment
         implements OnPreferenceChangeListener, DialogInterface.OnClickListener {
-
     static final String TAG = "SecuritySettings";
 
     // Lock Settings
@@ -66,6 +66,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
     private static final String KEY_DEVICE_ADMIN_CATEGORY = "device_admin_category";
     private static final String KEY_LOCK_AFTER_TIMEOUT = "lock_after_timeout";
     private static final String KEY_OWNER_INFO_SETTINGS = "owner_info_settings";
+    private static final String KEY_ENABLE_WIDGETS = "keyguard_enable_widgets";
+
     private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST = 123;
     private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_IMPROVE_REQUEST = 124;
     private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF = 125;
@@ -75,6 +77,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
     private static final String KEY_SHOW_PASSWORD = "show_password";
     private static final String KEY_CREDENTIAL_STORAGE_TYPE = "credential_storage_type";
     private static final String KEY_RESET_CREDENTIALS = "reset_credentials";
+    private static final String KEY_CREDENTIALS_INSTALL = "credentials_install";
     private static final String KEY_TOGGLE_INSTALL_APPLICATIONS = "toggle_install_applications";
     private static final String KEY_TOGGLE_VERIFY_APPLICATIONS = "toggle_verify_applications";
     private static final String KEY_POWER_INSTANTLY_LOCKS = "power_button_instantly_locks";
@@ -83,7 +86,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
     private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
 
     private PackageManager mPM;
-    DevicePolicyManager mDPM;
+    private DevicePolicyManager mDPM;
 
     private ChooseLockSettingsHelper mChooseLockSettingsHelper;
     private LockPatternUtils mLockPatternUtils;
@@ -101,11 +104,16 @@ public class SecuritySettings extends SettingsPreferenceFragment
     private DialogInterface mWarnInstallApps;
     private CheckBoxPreference mToggleVerifyApps;
     private CheckBoxPreference mPowerButtonInstantlyLocks;
+    private CheckBoxPreference mEnableKeyguardWidgets;
 
     private Preference mNotificationAccess;
 
     private boolean mIsPrimary;
 
+    public SecuritySettings() {
+        super(null /* Don't ask for restrictions pin on creation. */);
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -161,9 +169,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
 
 
         // Add options for device encryption
-        DevicePolicyManager dpm =
-                (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
-
         mIsPrimary = UserHandle.myUserId() == UserHandle.USER_OWNER;
 
         if (!mIsPrimary) {
@@ -179,7 +184,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
         }
 
         if (mIsPrimary) {
-            switch (dpm.getStorageEncryptionStatus()) {
+            switch (mDPM.getStorageEncryptionStatus()) {
             case DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE:
                 // The device is currently encrypted.
                 addPreferencesFromResource(R.xml.security_settings_encrypted);
@@ -237,13 +242,38 @@ public class SecuritySettings extends SettingsPreferenceFragment
             }
         }
 
+        // Enable or disable keyguard widget checkbox based on DPM state
+        mEnableKeyguardWidgets = (CheckBoxPreference) root.findPreference(KEY_ENABLE_WIDGETS);
+        if (mEnableKeyguardWidgets != null) {
+            if (ActivityManager.isLowRamDeviceStatic()) {
+                // Widgets take a lot of RAM, so disable them on low-memory devices
+                PreferenceGroup securityCategory
+                        = (PreferenceGroup) root.findPreference(KEY_SECURITY_CATEGORY);
+                if (securityCategory != null) {
+                    securityCategory.removePreference(root.findPreference(KEY_ENABLE_WIDGETS));
+                    mEnableKeyguardWidgets = null;
+                }
+            } else {
+                final boolean disabled = (0 != (mDPM.getKeyguardDisabledFeatures(null)
+                        & DevicePolicyManager.KEYGUARD_DISABLE_WIDGETS_ALL));
+                if (disabled) {
+                    mEnableKeyguardWidgets.setSummary(
+                            R.string.security_enable_widgets_disabled_summary);
+                } else {
+                    mEnableKeyguardWidgets.setSummary("");
+                }
+                mEnableKeyguardWidgets.setEnabled(!disabled);
+            }
+        }
+
         // Show password
         mShowPassword = (CheckBoxPreference) root.findPreference(KEY_SHOW_PASSWORD);
+        mResetCredentials = root.findPreference(KEY_RESET_CREDENTIALS);
 
         // Credential storage
         final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        mKeyStore = KeyStore.getInstance(); // needs to be initialized for onResume()
         if (!um.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) {
-            mKeyStore = KeyStore.getInstance();
             Preference credentialStorageType = root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE);
 
             final int storageSummaryRes =
@@ -251,7 +281,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
                         : R.string.credential_storage_type_software;
             credentialStorageType.setSummary(storageSummaryRes);
 
-            mResetCredentials = root.findPreference(KEY_RESET_CREDENTIALS);
         } else {
             removePreference(KEY_CREDENTIALS_MANAGER);
         }
@@ -303,6 +332,12 @@ public class SecuritySettings extends SettingsPreferenceFragment
             }
         }
 
+        if (shouldBePinProtected(RESTRICTIONS_PIN_SET)) {
+            protectByRestrictions(mToggleAppInstallation);
+            protectByRestrictions(mToggleVerifyApps);
+            protectByRestrictions(mResetCredentials);
+            protectByRestrictions(root.findPreference(KEY_CREDENTIALS_INSTALL));
+        }
         return root;
     }
 
@@ -467,10 +502,17 @@ public class SecuritySettings extends SettingsPreferenceFragment
         if (mResetCredentials != null) {
             mResetCredentials.setEnabled(!mKeyStore.isEmpty());
         }
+
+        if (mEnableKeyguardWidgets != null) {
+            mEnableKeyguardWidgets.setChecked(lockPatternUtils.getWidgetsEnabled());
+        }
     }
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        if (ensurePinRestrictedPreference(preference)) {
+            return true;
+        }
         final String key = preference.getKey();
 
         final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
@@ -514,6 +556,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
             lockPatternUtils.setVisiblePatternEnabled(isToggled(preference));
         } else if (KEY_POWER_INSTANTLY_LOCKS.equals(key)) {
             lockPatternUtils.setPowerButtonInstantlyLocks(isToggled(preference));
+        } else if (KEY_ENABLE_WIDGETS.equals(key)) {
+            lockPatternUtils.setWidgetsEnabled(mEnableKeyguardWidgets.isChecked());
         } else if (preference == mShowPassword) {
             Settings.System.putInt(getContentResolver(), Settings.System.TEXT_SHOW_PASSWORD,
                     mShowPassword.isChecked() ? 1 : 0);
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 02769e10f87..e93fa186130 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -19,15 +19,23 @@ package com.android.settings;
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.OnAccountsUpdateListener;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.admin.DevicePolicyManager;
+import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.RestrictionEntry;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
 import android.graphics.drawable.Drawable;
+import android.nfc.NfcAdapter;
 import android.os.Bundle;
 import android.os.INetworkManagementService;
 import android.os.RemoteException;
@@ -45,19 +53,42 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.Switch;
 import android.widget.TextView;
 
 import com.android.internal.util.ArrayUtils;
-import com.android.settings.AccessibilitySettings.ToggleAccessibilityServicePreferenceFragment;
+import com.android.settings.accessibility.AccessibilitySettings;
+import com.android.settings.accessibility.ToggleAccessibilityServicePreferenceFragment;
+import com.android.settings.accessibility.ToggleCaptioningPreferenceFragment;
 import com.android.settings.accounts.AccountSyncSettings;
 import com.android.settings.accounts.AuthenticatorHelper;
 import com.android.settings.accounts.ManageAccountsSettings;
+import com.android.settings.applications.AppOpsSummary;
+import com.android.settings.applications.ManageApplications;
+import com.android.settings.applications.ProcessStatsUi;
 import com.android.settings.bluetooth.BluetoothEnabler;
 import com.android.settings.bluetooth.BluetoothSettings;
+import com.android.settings.deviceinfo.Memory;
+import com.android.settings.deviceinfo.UsbSettings;
+import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
+import com.android.settings.inputmethod.KeyboardLayoutPickerFragment;
+import com.android.settings.inputmethod.SpellCheckersSettings;
+import com.android.settings.inputmethod.UserDictionaryList;
+import com.android.settings.location.LocationSettings;
+import com.android.settings.nfc.AndroidBeam;
+import com.android.settings.nfc.PaymentSettings;
+import com.android.settings.print.PrintJobSettingsFragment;
+import com.android.settings.print.PrintServiceSettingsFragment;
+import com.android.settings.print.PrintSettingsFragment;
+import com.android.settings.tts.TextToSpeechSettings;
+import com.android.settings.users.UserSettings;
+import com.android.settings.vpn2.VpnSettings;
 import com.android.settings.wfd.WifiDisplaySettings;
+import com.android.settings.wifi.AdvancedWifiSettings;
 import com.android.settings.wifi.WifiEnabler;
 import com.android.settings.wifi.WifiSettings;
 import com.android.settings.wifi.p2p.WifiP2pSettings;
@@ -90,6 +121,10 @@ public class Settings extends PreferenceActivity
     private static final String SAVE_KEY_CURRENT_HEADER = "com.android.settings.CURRENT_HEADER";
     private static final String SAVE_KEY_PARENT_HEADER = "com.android.settings.PARENT_HEADER";
 
+    static final int DIALOG_ONLY_ONE_HOME = 1;
+
+    private static boolean sShowNoHomeNotice = false;
+
     private String mFragmentClass;
     private int mTopLevelHeaderId;
     private Header mFirstHeader;
@@ -120,7 +155,10 @@ public class Settings extends PreferenceActivity
             R.id.system_section,
             R.id.date_time_settings,
             R.id.about_settings,
-            R.id.accessibility_settings
+            R.id.accessibility_settings,
+            R.id.print_settings,
+            R.id.nfc_payment_settings,
+            R.id.home_settings
     };
 
     private SharedPreferences mDevelopmentPreferences;
@@ -134,6 +172,23 @@ public class Settings extends PreferenceActivity
     private Header mLastHeader;
     private boolean mListeningToAccountUpdates;
 
+    private boolean mBatteryPresent = true;
+    private BroadcastReceiver mBatteryInfoReceiver = new BroadcastReceiver() {
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (Intent.ACTION_BATTERY_CHANGED.equals(action)) {
+                boolean batteryPresent = Utils.isBatteryPresent(intent);
+
+                if (mBatteryPresent != batteryPresent) {
+                    mBatteryPresent = batteryPresent;
+                    invalidateHeaders();
+                }
+            }
+        }
+    };
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         if (getIntent().hasExtra(EXTRA_UI_OPTIONS)) {
@@ -218,12 +273,16 @@ public class Settings extends PreferenceActivity
             ((HeaderAdapter) listAdapter).resume();
         }
         invalidateHeaders();
+
+        registerReceiver(mBatteryInfoReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
     }
 
     @Override
     public void onPause() {
         super.onPause();
 
+        unregisterReceiver(mBatteryInfoReceiver);
+
         ListAdapter listAdapter = getListAdapter();
         if (listAdapter instanceof HeaderAdapter) {
             ((HeaderAdapter) listAdapter).pause();
@@ -242,6 +301,69 @@ public class Settings extends PreferenceActivity
         }
     }
 
+    @Override
+    public boolean onIsMultiPane() {
+        return false;
+    }
+
+    private static final String[] ENTRY_FRAGMENTS = {
+        WirelessSettings.class.getName(),
+        WifiSettings.class.getName(),
+        AdvancedWifiSettings.class.getName(),
+        BluetoothSettings.class.getName(),
+        TetherSettings.class.getName(),
+        WifiP2pSettings.class.getName(),
+        VpnSettings.class.getName(),
+        DateTimeSettings.class.getName(),
+        LocalePicker.class.getName(),
+        InputMethodAndLanguageSettings.class.getName(),
+        SpellCheckersSettings.class.getName(),
+        UserDictionaryList.class.getName(),
+        UserDictionarySettings.class.getName(),
+        SoundSettings.class.getName(),
+        DisplaySettings.class.getName(),
+        DeviceInfoSettings.class.getName(),
+        ManageApplications.class.getName(),
+        ProcessStatsUi.class.getName(),
+        NotificationStation.class.getName(),
+        AppOpsSummary.class.getName(),
+        LocationSettings.class.getName(),
+        SecuritySettings.class.getName(),
+        PrivacySettings.class.getName(),
+        DeviceAdminSettings.class.getName(),
+        AccessibilitySettings.class.getName(),
+        ToggleCaptioningPreferenceFragment.class.getName(),
+        TextToSpeechSettings.class.getName(),
+        Memory.class.getName(),
+        DevelopmentSettings.class.getName(),
+        UsbSettings.class.getName(),
+        AndroidBeam.class.getName(),
+        WifiDisplaySettings.class.getName(),
+        PowerUsageSummary.class.getName(),
+        AccountSyncSettings.class.getName(),
+        CryptKeeperSettings.class.getName(),
+        DataUsageSummary.class.getName(),
+        DreamSettings.class.getName(),
+        UserSettings.class.getName(),
+        NotificationAccessSettings.class.getName(),
+        ManageAccountsSettings.class.getName(),
+        PrintSettingsFragment.class.getName(),
+        PrintJobSettingsFragment.class.getName(),
+        TrustedCredentialsSettings.class.getName(),
+        PaymentSettings.class.getName(),
+        KeyboardLayoutPickerFragment.class.getName()
+    };
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        // Almost all fragments are wrapped in this,
+        // except for a few that have their own activities.
+        for (int i = 0; i < ENTRY_FRAGMENTS.length; i++) {
+            if (ENTRY_FRAGMENTS[i].equals(fragmentName)) return true;
+        }
+        return false;
+    }
+
     private void switchToHeaderLocal(Header header) {
         mInLocalHeaderSwitch = true;
         switchToHeader(header);
@@ -387,7 +509,10 @@ public class Settings extends PreferenceActivity
                 WifiDisplaySettings.class.getName().equals(fragmentName) ||
                 BluetoothSettings.class.getName().equals(fragmentName) ||
                 DreamSettings.class.getName().equals(fragmentName) ||
-                ToggleAccessibilityServicePreferenceFragment.class.getName().equals(fragmentName)) {
+                LocationSettings.class.getName().equals(fragmentName) ||
+                ToggleAccessibilityServicePreferenceFragment.class.getName().equals(fragmentName) ||
+                PrintSettingsFragment.class.getName().equals(fragmentName) ||
+                PrintServiceSettingsFragment.class.getName().equals(fragmentName)) {
             intent.putExtra(EXTRA_UI_OPTIONS, ActivityInfo.UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW);
         }
 
@@ -400,8 +525,10 @@ public class Settings extends PreferenceActivity
      */
     @Override
     public void onBuildHeaders(List<Header> headers) {
-        loadHeadersFromResource(R.xml.settings_headers, headers);
-        updateHeaderList(headers);
+        if (!onIsHidingHeaders()) {
+            loadHeadersFromResource(R.xml.settings_headers, headers);
+            updateHeaderList(headers);
+        }
     }
 
     private void updateHeaderList(List<Header> target) {
@@ -439,15 +566,36 @@ public class Settings extends PreferenceActivity
                 } catch (RemoteException e) {
                     // ignored
                 }
+            } else if (id == R.id.battery_settings) {
+                // Remove battery settings when battery is not available. (e.g. TV)
+
+                if (!mBatteryPresent) {
+                    target.remove(i);
+                }
             } else if (id == R.id.account_settings) {
                 int headerIndex = i + 1;
                 i = insertAccountsHeaders(target, headerIndex);
+            } else if (id == R.id.home_settings) {
+                if (!updateHomeSettingHeaders(header)) {
+                    target.remove(i);
+                }
             } else if (id == R.id.user_settings) {
                 if (!UserHandle.MU_ENABLED
                         || !UserManager.supportsMultipleUsers()
                         || Utils.isMonkeyRunning()) {
                     target.remove(i);
                 }
+            } else if (id == R.id.nfc_payment_settings) {
+                if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC)) {
+                    target.remove(i);
+                } else {
+                    // Only show if NFC is on and we have the HCE feature
+                    NfcAdapter adapter = NfcAdapter.getDefaultAdapter(this);
+                    if (!adapter.isEnabled() || !getPackageManager().hasSystemFeature(
+                            PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) {
+                        target.remove(i);
+                    }
+                }
             } else if (id == R.id.development_settings) {
                 if (!showDev) {
                     target.remove(i);
@@ -518,6 +666,7 @@ public class Settings extends PreferenceActivity
                 }
             }
             accountHeaders.add(accHeader);
+            mAuthenticatorHelper.preloadDrawableForType(this, accountType);
         }
 
         // Sort by label
@@ -538,6 +687,44 @@ public class Settings extends PreferenceActivity
         return headerIndex;
     }
 
+    private boolean updateHomeSettingHeaders(Header header) {
+        // Once we decide to show Home settings, keep showing it forever
+        SharedPreferences sp = getSharedPreferences(HomeSettings.HOME_PREFS, Context.MODE_PRIVATE);
+        if (sp.getBoolean(HomeSettings.HOME_PREFS_DO_SHOW, false)) {
+            return true;
+        }
+
+        try {
+            final ArrayList<ResolveInfo> homeApps = new ArrayList<ResolveInfo>();
+            getPackageManager().getHomeActivities(homeApps);
+            if (homeApps.size() < 2) {
+                // When there's only one available home app, omit this settings
+                // category entirely at the top level UI.  If the user just
+                // uninstalled the penultimate home app candidiate, we also
+                // now tell them about why they aren't seeing 'Home' in the list.
+                if (sShowNoHomeNotice) {
+                    sShowNoHomeNotice = false;
+                    NoHomeDialogFragment.show(this);
+                }
+                return false;
+            } else {
+                // Okay, we're allowing the Home settings category.  Tell it, when
+                // invoked via this front door, that we'll need to be told about the
+                // case when the user uninstalls all but one home app.
+                if (header.fragmentArguments == null) {
+                    header.fragmentArguments = new Bundle();
+                }
+                header.fragmentArguments.putBoolean(HomeSettings.HOME_SHOW_NOTICE, true);
+            }
+        } catch (Exception e) {
+            // Can't look up the home activity; bail on configuring the icon
+            Log.w(LOG_TAG, "Problem looking up home activity!", e);
+        }
+
+        sp.edit().putBoolean(HomeSettings.HOME_PREFS_DO_SHOW, true).apply();
+        return true;
+    }
+
     private void getMetaData() {
         try {
             ActivityInfo ai = getPackageManager().getActivityInfo(getComponentName(),
@@ -571,21 +758,40 @@ public class Settings extends PreferenceActivity
         return super.getNextButton();
     }
 
+    public static class NoHomeDialogFragment extends DialogFragment {
+        public static void show(Activity parent) {
+            final NoHomeDialogFragment dialog = new NoHomeDialogFragment();
+            dialog.show(parent.getFragmentManager(), null);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            return new AlertDialog.Builder(getActivity())
+                    .setMessage(R.string.only_one_home_message)
+                    .setPositiveButton(android.R.string.ok, null)
+                    .create();
+        }
+    }
+
     private static class HeaderAdapter extends ArrayAdapter<Header> {
         static final int HEADER_TYPE_CATEGORY = 0;
         static final int HEADER_TYPE_NORMAL = 1;
         static final int HEADER_TYPE_SWITCH = 2;
-        private static final int HEADER_TYPE_COUNT = HEADER_TYPE_SWITCH + 1;
+        static final int HEADER_TYPE_BUTTON = 3;
+        private static final int HEADER_TYPE_COUNT = HEADER_TYPE_BUTTON + 1;
 
         private final WifiEnabler mWifiEnabler;
         private final BluetoothEnabler mBluetoothEnabler;
         private AuthenticatorHelper mAuthHelper;
+        private DevicePolicyManager mDevicePolicyManager;
 
         private static class HeaderViewHolder {
             ImageView icon;
             TextView title;
             TextView summary;
             Switch switch_;
+            ImageButton button_;
+            View divider_;
         }
 
         private LayoutInflater mInflater;
@@ -595,6 +801,8 @@ public class Settings extends PreferenceActivity
                 return HEADER_TYPE_CATEGORY;
             } else if (header.id == R.id.wifi_settings || header.id == R.id.bluetooth_settings) {
                 return HEADER_TYPE_SWITCH;
+            } else if (header.id == R.id.security_settings) {
+                return HEADER_TYPE_BUTTON;
             } else {
                 return HEADER_TYPE_NORMAL;
             }
@@ -627,7 +835,7 @@ public class Settings extends PreferenceActivity
         }
 
         public HeaderAdapter(Context context, List<Header> objects,
-                AuthenticatorHelper authenticatorHelper) {
+                AuthenticatorHelper authenticatorHelper, DevicePolicyManager dpm) {
             super(context, 0, objects);
 
             mAuthHelper = authenticatorHelper;
@@ -637,6 +845,7 @@ public class Settings extends PreferenceActivity
             // Switches inflated from their layouts. Must be done before adapter is set in super
             mWifiEnabler = new WifiEnabler(context, new Switch(context));
             mBluetoothEnabler = new BluetoothEnabler(context, new Switch(context));
+            mDevicePolicyManager = dpm;
         }
 
         @Override
@@ -666,6 +875,18 @@ public class Settings extends PreferenceActivity
                         holder.switch_ = (Switch) view.findViewById(R.id.switchWidget);
                         break;
 
+                    case HEADER_TYPE_BUTTON:
+                        view = mInflater.inflate(R.layout.preference_header_button_item, parent,
+                                false);
+                        holder.icon = (ImageView) view.findViewById(R.id.icon);
+                        holder.title = (TextView)
+                                view.findViewById(com.android.internal.R.id.title);
+                        holder.summary = (TextView)
+                                view.findViewById(com.android.internal.R.id.summary);
+                        holder.button_ = (ImageButton) view.findViewById(R.id.buttonWidget);
+                        holder.divider_ = view.findViewById(R.id.divider);
+                        break;
+
                     case HEADER_TYPE_NORMAL:
                         view = mInflater.inflate(
                                 R.layout.preference_header_item, parent,
@@ -696,38 +917,75 @@ public class Settings extends PreferenceActivity
                     } else {
                         mBluetoothEnabler.setSwitch(holder.switch_);
                     }
-                    // No break, fall through on purpose to update common fields
+                    updateCommonHeaderView(header, holder);
+                    break;
+
+                case HEADER_TYPE_BUTTON:
+                    if (header.id == R.id.security_settings) {
+                        boolean hasCert = DevicePolicyManager.hasAnyCaCertsInstalled();
+                        if (hasCert) {
+                            holder.button_.setVisibility(View.VISIBLE);
+                            holder.divider_.setVisibility(View.VISIBLE);
+                            boolean isManaged = mDevicePolicyManager.getDeviceOwner() != null;
+                            if (isManaged) {
+                                holder.button_.setImageResource(R.drawable.ic_settings_about);
+                            } else {
+                                holder.button_.setImageResource(
+                                        android.R.drawable.stat_notify_error);
+                            }
+                            holder.button_.setOnClickListener(new OnClickListener() {
+                                @Override
+                                public void onClick(View v) {
+                                    Intent intent = new Intent(
+                                            android.provider.Settings.ACTION_MONITORING_CERT_INFO);
+                                    getContext().startActivity(intent);
+                                }
+                            });
+                        } else {
+                            holder.button_.setVisibility(View.GONE);
+                            holder.divider_.setVisibility(View.GONE);
+                        }
+                    }
+                    updateCommonHeaderView(header, holder);
+                    break;
 
-                    //$FALL-THROUGH$
                 case HEADER_TYPE_NORMAL:
-                    if (header.extras != null
-                            && header.extras.containsKey(ManageAccountsSettings.KEY_ACCOUNT_TYPE)) {
-                        String accType = header.extras.getString(
-                                ManageAccountsSettings.KEY_ACCOUNT_TYPE);
-                        ViewGroup.LayoutParams lp = holder.icon.getLayoutParams();
-                        lp.width = getContext().getResources().getDimensionPixelSize(
-                                R.dimen.header_icon_width);
-                        lp.height = lp.width;
-                        holder.icon.setLayoutParams(lp);
-                        Drawable icon = mAuthHelper.getDrawableForType(getContext(), accType);
-                        holder.icon.setImageDrawable(icon);
-                    } else {
-                        holder.icon.setImageResource(header.iconRes);
-                    }
-                    holder.title.setText(header.getTitle(getContext().getResources()));
-                    CharSequence summary = header.getSummary(getContext().getResources());
-                    if (!TextUtils.isEmpty(summary)) {
-                        holder.summary.setVisibility(View.VISIBLE);
-                        holder.summary.setText(summary);
-                    } else {
-                        holder.summary.setVisibility(View.GONE);
-                    }
+                    updateCommonHeaderView(header, holder);
                     break;
             }
 
             return view;
         }
 
+        private void updateCommonHeaderView(Header header, HeaderViewHolder holder) {
+                if (header.extras != null
+                        && header.extras.containsKey(ManageAccountsSettings.KEY_ACCOUNT_TYPE)) {
+                    String accType = header.extras.getString(
+                            ManageAccountsSettings.KEY_ACCOUNT_TYPE);
+                    Drawable icon = mAuthHelper.getDrawableForType(getContext(), accType);
+                    setHeaderIcon(holder, icon);
+                } else {
+                    holder.icon.setImageResource(header.iconRes);
+                }
+                holder.title.setText(header.getTitle(getContext().getResources()));
+                CharSequence summary = header.getSummary(getContext().getResources());
+                if (!TextUtils.isEmpty(summary)) {
+                    holder.summary.setVisibility(View.VISIBLE);
+                    holder.summary.setText(summary);
+                } else {
+                    holder.summary.setVisibility(View.GONE);
+                }
+            }
+
+        private void setHeaderIcon(HeaderViewHolder holder, Drawable icon) {
+            ViewGroup.LayoutParams lp = holder.icon.getLayoutParams();
+            lp.width = getContext().getResources().getDimensionPixelSize(
+                    R.dimen.header_icon_width);
+            lp.height = lp.width;
+            holder.icon.setLayoutParams(lp);
+            holder.icon.setImageDrawable(icon);
+        }
+
         public void resume() {
             mWifiEnabler.resume();
             mBluetoothEnabler.resume();
@@ -784,7 +1042,9 @@ public class Settings extends PreferenceActivity
         if (adapter == null) {
             super.setListAdapter(null);
         } else {
-            super.setListAdapter(new HeaderAdapter(this, getHeaders(), mAuthenticatorHelper));
+            DevicePolicyManager dpm =
+                    (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+            super.setListAdapter(new HeaderAdapter(this, getHeaders(), mAuthenticatorHelper, dpm));
         }
     }
 
@@ -796,6 +1056,10 @@ public class Settings extends PreferenceActivity
         invalidateHeaders();
     }
 
+    public static void requestHomeNotice() {
+        sShowNoHomeNotice = true;
+    }
+
     /*
      * Settings subclasses for launching independently.
      */
@@ -822,6 +1086,7 @@ public class Settings extends PreferenceActivity
     public static class StorageUseActivity extends Settings { /* empty */ }
     public static class DevelopmentSettingsActivity extends Settings { /* empty */ }
     public static class AccessibilitySettingsActivity extends Settings { /* empty */ }
+    public static class CaptioningSettingsActivity extends Settings { /* empty */ }
     public static class SecuritySettingsActivity extends Settings { /* empty */ }
     public static class LocationSettingsActivity extends Settings { /* empty */ }
     public static class PrivacySettingsActivity extends Settings { /* empty */ }
@@ -841,4 +1106,9 @@ public class Settings extends PreferenceActivity
     public static class NotificationStationActivity extends Settings { /* empty */ }
     public static class UserSettingsActivity extends Settings { /* empty */ }
     public static class NotificationAccessSettingsActivity extends Settings { /* empty */ }
+    public static class UsbSettingsActivity extends Settings { /* empty */ }
+    public static class TrustedCredentialsSettingsActivity extends Settings { /* empty */ }
+    public static class PaymentSettingsActivity extends Settings { /* empty */ }
+    public static class PrintSettingsActivity extends Settings { /* empty */ }
+    public static class PrintJobSettingsActivity extends Settings { /* empty */ }
 }
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 60765a99da0..0a382b57892 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -241,7 +241,7 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
                     mParentFragment = getFragmentManager().findFragmentById(mParentFragmentId);
                     if (!(mParentFragment instanceof DialogCreatable)) {
                         throw new IllegalArgumentException(
-                                (mParentFragment != null 
+                                (mParentFragment != null
                                         ? mParentFragment.getClass().getName()
                                         : mParentFragmentId)
                                 + " must implement "
diff --git a/src/com/android/settings/SmsDefaultDialog.java b/src/com/android/settings/SmsDefaultDialog.java
new file mode 100644
index 00000000000..d9a6c5f3790
--- /dev/null
+++ b/src/com/android/settings/SmsDefaultDialog.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.provider.Telephony.Sms.Intents;
+import android.telephony.TelephonyManager;
+
+import com.android.internal.app.AlertActivity;
+import com.android.internal.app.AlertController;
+import com.android.internal.telephony.SmsApplication;
+import com.android.internal.telephony.SmsApplication.SmsApplicationData;
+import com.android.settings.R;
+
+public final class SmsDefaultDialog extends AlertActivity implements
+        DialogInterface.OnClickListener {
+    private ComponentName mNewDefault;
+    private SmsApplicationData mNewSmsApplicationData;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        String packageName = intent.getStringExtra(Intents.EXTRA_PACKAGE_NAME);
+
+        setResult(RESULT_CANCELED);
+        if (!buildDialog(packageName)) {
+            finish();
+        }
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        switch (which) {
+            case BUTTON_POSITIVE:
+                SmsApplication.setDefaultApplication(mNewSmsApplicationData.mPackageName, this);
+                setResult(RESULT_OK);
+                break;
+            case BUTTON_NEGATIVE:
+                break;
+        }
+    }
+
+    private boolean buildDialog(String packageName) {
+        TelephonyManager tm = (TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
+        if (tm.getPhoneType() == TelephonyManager.PHONE_TYPE_NONE) {
+            // No phone, no SMS
+            return false;
+        }
+
+        mNewSmsApplicationData = SmsApplication.getSmsApplicationData(packageName, this);
+        if (mNewSmsApplicationData == null) {
+            return false;
+        }
+
+        SmsApplicationData oldSmsApplicationData = null;
+        ComponentName oldSmsComponent = SmsApplication.getDefaultSmsApplication(this, true);
+        if (oldSmsComponent != null) {
+            oldSmsApplicationData =
+                    SmsApplication.getSmsApplicationData(oldSmsComponent.getPackageName(), this);
+            if (oldSmsApplicationData.mPackageName.equals(mNewSmsApplicationData.mPackageName)) {
+                return false;
+            }
+        }
+
+        // Compose dialog; get
+        final AlertController.AlertParams p = mAlertParams;
+        p.mTitle = getString(R.string.sms_change_default_dialog_title);
+        if (oldSmsApplicationData != null) {
+            p.mMessage = getString(R.string.sms_change_default_dialog_text,
+                    mNewSmsApplicationData.mApplicationName,
+                    oldSmsApplicationData.mApplicationName);
+        } else {
+            p.mMessage = getString(R.string.sms_change_default_no_previous_dialog_text,
+                    mNewSmsApplicationData.mApplicationName);
+        }
+        p.mPositiveButtonText = getString(R.string.yes);
+        p.mNegativeButtonText = getString(R.string.no);
+        p.mPositiveButtonListener = this;
+        p.mNegativeButtonListener = this;
+        setupAlert();
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/SmsListPreference.java b/src/com/android/settings/SmsListPreference.java
new file mode 100644
index 00000000000..15df776c1d2
--- /dev/null
+++ b/src/com/android/settings/SmsListPreference.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.Activity;
+import android.app.AlertDialog.Builder;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.preference.ListPreference;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.CheckedTextView;
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+
+/**
+ * Extends ListPreference to allow us to show the icons for the available SMS applications. We do
+ * this because the names of SMS applications are very similar and the user may not be able to
+ * determine what app they are selecting without an icon.
+ */
+public class SmsListPreference extends ListPreference {
+    private Drawable[] mEntryDrawables;
+
+    public class SmsArrayAdapter extends ArrayAdapter<CharSequence> {
+        private Drawable[] mImageDrawables = null;
+        private int mSelectedIndex = 0;
+
+        public SmsArrayAdapter(Context context, int textViewResourceId,
+                CharSequence[] objects, Drawable[] imageDrawables, int selectedIndex) {
+            super(context, textViewResourceId, objects);
+            mSelectedIndex = selectedIndex;
+            mImageDrawables = imageDrawables;
+        }
+
+        public View getView(int position, View convertView, ViewGroup parent) {
+            LayoutInflater inflater = ((Activity)getContext()).getLayoutInflater();
+            View view = inflater.inflate(R.layout.sms_preference_item, parent, false);
+            CheckedTextView checkedTextView = (CheckedTextView)view.findViewById(R.id.sms_text);
+            checkedTextView.setText(getItem(position));
+            if (position == mSelectedIndex) {
+                checkedTextView.setChecked(true);
+            }
+            ImageView imageView = (ImageView)view.findViewById(R.id.sms_image);
+            imageView.setImageDrawable(mImageDrawables[position]);
+            return view;
+        }
+    }
+
+    public SmsListPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public void setEntryDrawables(Drawable[] entries) {
+        mEntryDrawables = entries;
+    }
+
+    public Drawable[] getEntryDrawables() {
+        return mEntryDrawables;
+    }
+
+    @Override
+    protected void onPrepareDialogBuilder(Builder builder) {
+        int selectedIndex = findIndexOfValue(getValue());
+        ListAdapter adapter = new SmsArrayAdapter(getContext(),
+            R.layout.sms_preference_item, getEntries(), mEntryDrawables, selectedIndex);
+        builder.setAdapter(adapter, this);
+        super.onPrepareDialogBuilder(builder);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/SubSettings.java b/src/com/android/settings/SubSettings.java
index eb275ad6e83..34e9ba3a707 100644
--- a/src/com/android/settings/SubSettings.java
+++ b/src/com/android/settings/SubSettings.java
@@ -16,6 +16,11 @@
 
 package com.android.settings;
 
+import android.app.Fragment;
+import android.util.Log;
+
+import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;
+
 /**
  * Stub class for showing sub-settings; we can't use the main Settings class
  * since for our app it is a special singleTask class.
@@ -27,4 +32,10 @@ public class SubSettings extends Settings {
         finish();
         return true;
     }
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        Log.d("SubSettings", "Launching fragment " + fragmentName);
+        return true;
+    }
 }
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 4775b174072..4e0933d534a 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -38,6 +38,8 @@ import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.SystemProperties;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
@@ -592,4 +594,17 @@ public class TetherSettings extends SettingsPreferenceFragment
     public int getHelpResource() {
         return R.string.help_url_tether;
     }
+
+    /**
+     * Checks whether this screen will have anything to show on this device. This is called by
+     * the shortcut picker for Settings shortcuts (home screen widget).
+     * @param context a context object for getting a system service.
+     * @return whether Tether & portable hotspot should be shown in the shortcuts picker.
+     */
+    public static boolean showInShortcuts(Context context) {
+        final ConnectivityManager cm =
+                (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        final boolean isSecondaryUser = UserHandle.myUserId() != UserHandle.USER_OWNER;
+        return !isSecondaryUser && cm.isTetheringSupported();
+    }
 }
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index cdfe7cd303a..cdb96cbbc5a 100644
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -16,14 +16,18 @@
 
 package com.android.settings;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Fragment;
+import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.net.http.SslCertificate;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.RemoteException;
+import android.os.UserManager;
 import android.security.IKeyChainService;
 import android.security.KeyChain;
 import android.security.KeyChain.KeyChainConnection;
@@ -52,6 +56,16 @@ public class TrustedCredentialsSettings extends Fragment {
 
     private static final String TAG = "TrustedCredentialsSettings";
 
+    private UserManager mUserManager;
+
+    private static final String USER_ACTION = "com.android.settings.TRUSTED_CREDENTIALS_USER";
+
+    private static final int REQUEST_PIN_CHALLENGE = 12309;
+    // If the restriction PIN is entered correctly.
+    private boolean mChallengeSucceeded;
+    private boolean mChallengeRequested;
+
+
     private enum Tab {
         SYSTEM("system",
                R.string.trusted_credentials_system_tab,
@@ -142,6 +156,13 @@ public class TrustedCredentialsSettings extends Fragment {
 
     private TabHost mTabHost;
 
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+    }
+
+
     @Override public View onCreateView(
             LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
         mTabHost = (TabHost) inflater.inflate(R.layout.trusted_credentials, parent, false);
@@ -149,6 +170,10 @@ public class TrustedCredentialsSettings extends Fragment {
         addTab(Tab.SYSTEM);
         // TODO add Install button on Tab.USER to go to CertInstaller like KeyChainActivity
         addTab(Tab.USER);
+        if (getActivity().getIntent() != null &&
+                USER_ACTION.equals(getActivity().getIntent().getAction())) {
+            mTabHost.setCurrentTabByTag(Tab.USER.mTag);
+        }
         return mTabHost;
     }
 
@@ -355,6 +380,11 @@ public class TrustedCredentialsSettings extends Fragment {
         removeButton.setText(certHolder.mTab.getButtonLabel(certHolder));
         removeButton.setOnClickListener(new View.OnClickListener() {
             @Override public void onClick(View v) {
+                if (mUserManager.hasRestrictionsChallenge() && !mChallengeSucceeded) {
+                    ensurePin();
+                    return;
+                }
+
                 AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
                 builder.setMessage(certHolder.mTab.getButtonConfirmation(certHolder));
                 builder.setPositiveButton(
@@ -379,6 +409,35 @@ public class TrustedCredentialsSettings extends Fragment {
         certDialog.show();
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_PIN_CHALLENGE) {
+            mChallengeRequested = false;
+            if (resultCode == Activity.RESULT_OK) {
+                mChallengeSucceeded = true;
+            }
+            return;
+        }
+
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    private void ensurePin() {
+        if (!mChallengeSucceeded) {
+            final UserManager um = UserManager.get(getActivity());
+            if (!mChallengeRequested) {
+                if (um.hasRestrictionsChallenge()) {
+                    Intent requestPin =
+                            new Intent(Intent.ACTION_RESTRICTIONS_CHALLENGE);
+                    startActivityForResult(requestPin, REQUEST_PIN_CHALLENGE);
+                    mChallengeRequested = true;
+                }
+            }
+        }
+        mChallengeSucceeded = false;
+    }
+
+
     private class AliasOperation extends AsyncTask<Void, Void, Boolean> {
         private final CertHolder mCertHolder;
         private AliasOperation(CertHolder certHolder) {
diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index b561ed46684..da120048d5a 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -16,38 +16,30 @@
 
 package com.android.settings;
 
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
+import com.android.settings.inputmethod.UserDictionaryAddWordContents;
+import com.android.settings.inputmethod.UserDictionarySettingsUtils;
+
 import android.app.ListFragment;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.provider.UserDictionary;
-import android.text.InputType;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.widget.AlphabetIndexer;
-import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.SectionIndexer;
 import android.widget.SimpleCursorAdapter;
 import android.widget.TextView;
 
-import com.android.settings.inputmethod.UserDictionaryAddWordContents;
-
 import java.util.Locale;
 
 public class UserDictionarySettings extends ListFragment {
@@ -82,6 +74,7 @@ public class UserDictionarySettings extends ListFragment {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        getActivity().getActionBar().setTitle(R.string.user_dict_settings_title);
     }
 
     @Override
@@ -123,7 +116,9 @@ public class UserDictionarySettings extends ListFragment {
         listView.setEmptyView(emptyView);
 
         setHasOptionsMenu(true);
-
+        // Show the language as a subtitle of the action bar
+        getActivity().getActionBar().setSubtitle(
+                UserDictionarySettingsUtils.getLocaleDisplayName(getActivity(), mLocale));
     }
 
     private Cursor createCursor(final String locale) {
@@ -170,7 +165,7 @@ public class UserDictionarySettings extends ListFragment {
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         MenuItem actionItem =
                 menu.add(0, OPTIONS_MENU_ADD, 0, R.string.user_dict_settings_add_menu_title)
-                .setIcon(R.drawable.ic_menu_add);
+                .setIcon(R.drawable.ic_menu_add_dark);
         actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
                 MenuItem.SHOW_AS_ACTION_WITH_TEXT);
     }
@@ -241,8 +236,9 @@ public class UserDictionarySettings extends ListFragment {
 
         private AlphabetIndexer mIndexer;
 
-        private ViewBinder mViewBinder = new ViewBinder() {
+        private final ViewBinder mViewBinder = new ViewBinder() {
 
+            @Override
             public boolean setViewValue(View v, Cursor c, int columnIndex) {
                 if (columnIndex == INDEX_SHORTCUT) {
                     final String shortcut = c.getString(INDEX_SHORTCUT);
@@ -273,14 +269,17 @@ public class UserDictionarySettings extends ListFragment {
             setViewBinder(mViewBinder);
         }
 
+        @Override
         public int getPositionForSection(int section) {
             return null == mIndexer ? 0 : mIndexer.getPositionForSection(section);
         }
 
+        @Override
         public int getSectionForPosition(int position) {
             return null == mIndexer ? 0 : mIndexer.getSectionForPosition(position);
         }
 
+        @Override
         public Object[] getSections() {
             return null == mIndexer ? null : mIndexer.getSections();
         }
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index f031f0a0345..a8d0e8f5a16 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -330,7 +330,7 @@ public class Utils {
     /**
      * Returns the WIFI IP Addresses, if any, taking into account IPv4 and IPv6 style addresses.
      * @param context the application context
-     * @return the formatted and comma-separated IP addresses, or null if none.
+     * @return the formatted and newline-separated IP addresses, or null if none.
      */
     public static String getWifiIpAddresses(Context context) {
         ConnectivityManager cm = (ConnectivityManager)
@@ -343,7 +343,7 @@ public class Utils {
      * Returns the default link's IP addresses, if any, taking into account IPv4 and IPv6 style
      * addresses.
      * @param context the application context
-     * @return the formatted and comma-separated IP addresses, or null if none.
+     * @return the formatted and newline-separated IP addresses, or null if none.
      */
     public static String getDefaultIpAddresses(Context context) {
         ConnectivityManager cm = (ConnectivityManager)
@@ -354,14 +354,14 @@ public class Utils {
 
     private static String formatIpAddresses(LinkProperties prop) {
         if (prop == null) return null;
-        Iterator<InetAddress> iter = prop.getAddresses().iterator();
+        Iterator<InetAddress> iter = prop.getAllAddresses().iterator();
         // If there are no entries, return null
         if (!iter.hasNext()) return null;
         // Concatenate all available addresses, comma separated
         String addresses = "";
         while (iter.hasNext()) {
             addresses += iter.next().getHostAddress();
-            if (iter.hasNext()) addresses += ", ";
+            if (iter.hasNext()) addresses += "\n";
         }
         return addresses;
     }
@@ -386,17 +386,22 @@ public class Utils {
         }
     }
 
+    public static boolean isBatteryPresent(Intent batteryChangedIntent) {
+        return batteryChangedIntent.getBooleanExtra(BatteryManager.EXTRA_PRESENT, true);
+    }
+
     public static String getBatteryPercentage(Intent batteryChangedIntent) {
-        int level = batteryChangedIntent.getIntExtra("level", 0);
-        int scale = batteryChangedIntent.getIntExtra("scale", 100);
+        int level = batteryChangedIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
+        int scale = batteryChangedIntent.getIntExtra(BatteryManager.EXTRA_SCALE, 100);
         return String.valueOf(level * 100 / scale) + "%";
     }
 
     public static String getBatteryStatus(Resources res, Intent batteryChangedIntent) {
         final Intent intent = batteryChangedIntent;
 
-        int plugType = intent.getIntExtra("plugged", 0);
-        int status = intent.getIntExtra("status", BatteryManager.BATTERY_STATUS_UNKNOWN);
+        int plugType = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0);
+        int status = intent.getIntExtra(BatteryManager.EXTRA_STATUS,
+                BatteryManager.BATTERY_STATUS_UNKNOWN);
         String statusString;
         if (status == BatteryManager.BATTERY_STATUS_CHARGING) {
             statusString = res.getString(R.string.battery_info_status_charging);
@@ -443,8 +448,7 @@ public class Utils {
             ((PreferenceFrameLayout.LayoutParams) child.getLayoutParams()).removeBorders = true;
 
             final Resources res = list.getResources();
-            final int paddingSide = res.getDimensionPixelSize(
-                    com.android.internal.R.dimen.preference_fragment_padding_side);
+            final int paddingSide = res.getDimensionPixelSize(R.dimen.settings_side_margin);
             final int paddingBottom = res.getDimensionPixelSize(
                     com.android.internal.R.dimen.preference_fragment_padding_bottom);
 
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 8124b3b8e5c..6724cc129a6 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -16,35 +16,44 @@
 
 package com.android.settings;
 
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.net.Uri;
 import android.nfc.NfcAdapter;
 import android.os.Bundle;
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
+
+import com.android.internal.telephony.SmsApplication;
+import com.android.internal.telephony.SmsApplication.SmsApplicationData;
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.TelephonyProperties;
 import com.android.settings.nfc.NfcEnabler;
-import com.android.settings.NsdEnabler;
 
-public class WirelessSettings extends SettingsPreferenceFragment {
+import java.util.Collection;
+
+public class WirelessSettings extends RestrictedSettingsFragment
+        implements OnPreferenceChangeListener {
     private static final String TAG = "WirelessSettings";
 
     private static final String KEY_TOGGLE_AIRPLANE = "toggle_airplane";
@@ -56,6 +65,7 @@ public class WirelessSettings extends SettingsPreferenceFragment {
     private static final String KEY_PROXY_SETTINGS = "proxy_settings";
     private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
     private static final String KEY_MANAGE_MOBILE_PLAN = "manage_mobile_plan";
+    private static final String KEY_SMS_APPLICATION = "sms_application";
     private static final String KEY_TOGGLE_NSD = "toggle_nsd"; //network service discovery
     private static final String KEY_CELL_BROADCAST_SETTINGS = "cell_broadcast_settings";
 
@@ -74,6 +84,11 @@ public class WirelessSettings extends SettingsPreferenceFragment {
     private static final int MANAGE_MOBILE_PLAN_DIALOG_ID = 1;
     private static final String SAVED_MANAGE_MOBILE_PLAN_MSG = "mManageMobilePlanMessage";
 
+    private SmsListPreference mSmsApplicationPreference;
+
+    public WirelessSettings() {
+        super(null);
+    }
     /**
      * Invoked on each preference click in this hierarchy, overrides
      * PreferenceActivity's implementation.  Used to make sure we track the
@@ -81,6 +96,9 @@ public class WirelessSettings extends SettingsPreferenceFragment {
      */
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        if (ensurePinRestrictedPreference(preference)) {
+            return true;
+        }
         log("onPreferenceTreeClick: preference=" + preference);
         if (preference == mAirplaneModePreference && Boolean.parseBoolean(
                 SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) {
@@ -97,21 +115,22 @@ public class WirelessSettings extends SettingsPreferenceFragment {
     }
 
     private String mManageMobilePlanMessage;
-
+    private static final String CONNECTED_TO_PROVISIONING_NETWORK_ACTION
+            = "com.android.server.connectivityservice.CONNECTED_TO_PROVISIONING_NETWORK_ACTION";
     public void onManageMobilePlanClick() {
         log("onManageMobilePlanClick:");
         mManageMobilePlanMessage = null;
         Resources resources = getActivity().getResources();
 
-        NetworkInfo ni = mCm.getActiveNetworkInfo();
+        NetworkInfo ni = mCm.getProvisioningOrActiveNetworkInfo();
         if (mTm.hasIccCard() && (ni != null)) {
             // Get provisioning URL
             String url = mCm.getMobileProvisioningUrl();
             if (!TextUtils.isEmpty(url)) {
-                // Send user to provisioning webpage
-                Intent intent = new Intent(Intent.ACTION_VIEW);
-                intent.setData(Uri.parse(url));
-                startActivity(intent);
+                Intent intent = new Intent(CONNECTED_TO_PROVISIONING_NETWORK_ACTION);
+                intent.putExtra("EXTRA_URL", url);
+                Context context = getActivity().getBaseContext();
+                context.sendBroadcast(intent);
                 mManageMobilePlanMessage = null;
             } else {
                 // No provisioning URL
@@ -145,6 +164,52 @@ public class WirelessSettings extends SettingsPreferenceFragment {
         }
     }
 
+    private void updateSmsApplicationSetting() {
+        log("updateSmsApplicationSetting:");
+        ComponentName appName = SmsApplication.getDefaultSmsApplication(getActivity(), true);
+        if (appName != null) {
+            String packageName = appName.getPackageName();
+
+            CharSequence[] values = mSmsApplicationPreference.getEntryValues();
+            for (int i = 0; i < values.length; i++) {
+                if (packageName.contentEquals(values[i])) {
+                    mSmsApplicationPreference.setValueIndex(i);
+                    mSmsApplicationPreference.setSummary(mSmsApplicationPreference.getEntries()[i]);
+                    break;
+                }
+            }
+        }
+    }
+
+    private void initSmsApplicationSetting() {
+        log("initSmsApplicationSetting:");
+        Collection<SmsApplicationData> smsApplications =
+                SmsApplication.getApplicationCollection(getActivity());
+
+        // If the list is empty the dialog will be empty, but we will not crash.
+        int count = smsApplications.size();
+        CharSequence[] entries = new CharSequence[count];
+        CharSequence[] entryValues = new CharSequence[count];
+        Drawable[] entryImages = new Drawable[count];
+
+        PackageManager packageManager = getPackageManager();
+        int i = 0;
+        for (SmsApplicationData smsApplicationData : smsApplications) {
+            entries[i] = smsApplicationData.mApplicationName;
+            entryValues[i] = smsApplicationData.mPackageName;
+            try {
+                entryImages[i] = packageManager.getApplicationIcon(smsApplicationData.mPackageName);
+            } catch (NameNotFoundException e) {
+                entryImages[i] = packageManager.getDefaultActivityIcon();
+            }
+            i++;
+        }
+        mSmsApplicationPreference.setEntries(entries);
+        mSmsApplicationPreference.setEntryValues(entryValues);
+        mSmsApplicationPreference.setEntryDrawables(entryImages);
+        updateSmsApplicationSetting();
+    }
+
     @Override
     public Dialog onCreateDialog(int dialogId) {
         log("onCreateDialog: dialogId=" + dialogId);
@@ -180,6 +245,11 @@ public class WirelessSettings extends SettingsPreferenceFragment {
         return toggleable != null && toggleable.contains(type);
     }
 
+    private boolean isSmsSupported() {
+        // Some tablet has sim card but could not do telephony operations. Skip those.
+        return (mTm.getPhoneType() != TelephonyManager.PHONE_TYPE_NONE);
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -204,6 +274,10 @@ public class WirelessSettings extends SettingsPreferenceFragment {
         mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
         mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam);
 
+        mSmsApplicationPreference = (SmsListPreference) findPreference(KEY_SMS_APPLICATION);
+        mSmsApplicationPreference.setOnPreferenceChangeListener(this);
+        initSmsApplicationSetting();
+
         // Remove NSD checkbox by default
         getPreferenceScreen().removePreference(nsd);
         //mNsdEnabler = new NsdEnabler(activity, nsd);
@@ -225,6 +299,8 @@ public class WirelessSettings extends SettingsPreferenceFragment {
                 ps.setDependency(KEY_TOGGLE_AIRPLANE);
             }
         }
+        protectByRestrictions(KEY_WIMAX_SETTINGS);
+
         // Manually set dependencies for Wifi when not toggleable.
         if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_WIFI)) {
             findPreference(KEY_VPN_SETTINGS).setDependency(KEY_TOGGLE_AIRPLANE);
@@ -232,7 +308,7 @@ public class WirelessSettings extends SettingsPreferenceFragment {
         if (isSecondaryUser) { // Disable VPN
             removePreference(KEY_VPN_SETTINGS);
         }
-
+        protectByRestrictions(KEY_VPN_SETTINGS);
         // Manually set dependencies for Bluetooth when not toggleable.
         if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_BLUETOOTH)) {
             // No bluetooth-dependent items in the list. Code kept in case one is added later.
@@ -257,6 +333,18 @@ public class WirelessSettings extends SettingsPreferenceFragment {
             removePreference(KEY_MOBILE_NETWORK_SETTINGS);
             removePreference(KEY_MANAGE_MOBILE_PLAN);
         }
+        protectByRestrictions(KEY_MOBILE_NETWORK_SETTINGS);
+        protectByRestrictions(KEY_MANAGE_MOBILE_PLAN);
+
+        // Remove SMS Application if the device does not support SMS
+        if (!isSmsSupported()) {
+            removePreference(KEY_SMS_APPLICATION);
+        }
+
+        // Remove Airplane Mode settings if it's a stationary device such as a TV.
+        if (getActivity().getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEVISION)) {
+            removePreference(KEY_TOGGLE_AIRPLANE);
+        }
 
         // Enable Proxy selector settings if allowed.
         Preference mGlobalProxy = findPreference(KEY_PROXY_SETTINGS);
@@ -275,6 +363,7 @@ public class WirelessSettings extends SettingsPreferenceFragment {
             Preference p = findPreference(KEY_TETHER_SETTINGS);
             p.setTitle(Utils.getTetheringLabel(cm));
         }
+        protectByRestrictions(KEY_TETHER_SETTINGS);
 
         // Enable link to CMAS app settings depending on the value in config.xml.
         boolean isCellBroadcastAppLinkEnabled = this.getResources().getBoolean(
@@ -295,6 +384,14 @@ public class WirelessSettings extends SettingsPreferenceFragment {
             Preference ps = findPreference(KEY_CELL_BROADCAST_SETTINGS);
             if (ps != null) root.removePreference(ps);
         }
+        protectByRestrictions(KEY_CELL_BROADCAST_SETTINGS);
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        initSmsApplicationSetting();
     }
 
     @Override
@@ -340,10 +437,21 @@ public class WirelessSettings extends SettingsPreferenceFragment {
             mAirplaneModeEnabler.setAirplaneModeInECM(isChoiceYes,
                     mAirplaneModePreference.isChecked());
         }
+        super.onActivityResult(requestCode, resultCode, data);
     }
 
     @Override
     protected int getHelpResource() {
         return R.string.help_url_more_networks;
     }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (preference == mSmsApplicationPreference && newValue != null) {
+            SmsApplication.setDefaultApplication(newValue.toString(), getActivity());
+            updateSmsApplicationSetting();
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/src/com/android/settings/ZonePicker.java b/src/com/android/settings/ZonePicker.java
index 20199540c62..0a9173f05a8 100644
--- a/src/com/android/settings/ZonePicker.java
+++ b/src/com/android/settings/ZonePicker.java
@@ -296,6 +296,8 @@ public class ZonePicker extends ListFragment {
 
     @Override
     public void onListItemClick(ListView listView, View v, int position, long id) {
+        // Ignore extra clicks
+        if (!isResumed()) return;
         final Map<?, ?> map = (Map<?, ?>)listView.getItemAtPosition(position);
         final String tzId = (String) map.get(KEY_ID);
 
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
new file mode 100644
index 00000000000..4d24d096850
--- /dev/null
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -0,0 +1,647 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.app.ActivityManagerNative;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.content.res.Configuration;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.RemoteException;
+import android.os.SystemProperties;
+import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.text.TextUtils.SimpleStringSplitter;
+import android.util.Log;
+import android.view.KeyCharacterMap;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.accessibility.AccessibilityManager;
+import android.widget.TextView;
+
+import com.android.internal.content.PackageMonitor;
+import com.android.internal.view.RotationPolicy;
+import com.android.internal.view.RotationPolicy.RotationPolicyListener;
+import com.android.settings.DialogCreatable;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Activity with the accessibility settings.
+ */
+public class AccessibilitySettings extends SettingsPreferenceFragment implements DialogCreatable,
+        Preference.OnPreferenceChangeListener {
+    private static final String LOG_TAG = "AccessibilitySettings";
+
+    private static final String DEFAULT_SCREENREADER_MARKET_LINK =
+            "market://search?q=pname:com.google.android.marvin.talkback";
+
+    private static final float LARGE_FONT_SCALE = 1.3f;
+
+    private static final String SYSTEM_PROPERTY_MARKET_URL = "ro.screenreader.market";
+
+    static final char ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR = ':';
+
+    private static final String KEY_INSTALL_ACCESSIBILITY_SERVICE_OFFERED_ONCE =
+            "key_install_accessibility_service_offered_once";
+
+    // Preference categories
+    private static final String SERVICES_CATEGORY = "services_category";
+    private static final String SYSTEM_CATEGORY = "system_category";
+
+    // Preferences
+    private static final String TOGGLE_LARGE_TEXT_PREFERENCE =
+            "toggle_large_text_preference";
+    private static final String TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE =
+            "toggle_power_button_ends_call_preference";
+    private static final String TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE =
+            "toggle_lock_screen_rotation_preference";
+    private static final String TOGGLE_SPEAK_PASSWORD_PREFERENCE =
+            "toggle_speak_password_preference";
+    private static final String SELECT_LONG_PRESS_TIMEOUT_PREFERENCE =
+            "select_long_press_timeout_preference";
+    private static final String ENABLE_ACCESSIBILITY_GESTURE_PREFERENCE_SCREEN =
+            "enable_global_gesture_preference_screen";
+    private static final String CAPTIONING_PREFERENCE_SCREEN =
+            "captioning_preference_screen";
+    private static final String DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN =
+            "screen_magnification_preference_screen";
+
+    // Extras passed to sub-fragments.
+    static final String EXTRA_PREFERENCE_KEY = "preference_key";
+    static final String EXTRA_CHECKED = "checked";
+    static final String EXTRA_TITLE = "title";
+    static final String EXTRA_SUMMARY = "summary";
+    static final String EXTRA_SETTINGS_TITLE = "settings_title";
+    static final String EXTRA_COMPONENT_NAME = "component_name";
+    static final String EXTRA_SETTINGS_COMPONENT_NAME = "settings_component_name";
+
+    // Timeout before we update the services if packages are added/removed
+    // since the AccessibilityManagerService has to do that processing first
+    // to generate the AccessibilityServiceInfo we need for proper
+    // presentation.
+    private static final long DELAY_UPDATE_SERVICES_MILLIS = 1000;
+
+    // Dialog IDs.
+    private static final int DIALOG_ID_NO_ACCESSIBILITY_SERVICES = 1;
+
+    // Auxiliary members.
+    final static SimpleStringSplitter sStringColonSplitter =
+            new SimpleStringSplitter(ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR);
+
+    static final Set<ComponentName> sInstalledServices = new HashSet<ComponentName>();
+
+    private final Map<String, String> mLongPressTimeoutValuetoTitleMap =
+            new HashMap<String, String>();
+
+    private final Configuration mCurConfig = new Configuration();
+
+    private final Handler mHandler = new Handler();
+
+    private final Runnable mUpdateRunnable = new Runnable() {
+        @Override
+        public void run() {
+            loadInstalledServices();
+            updateServicesPreferences();
+        }
+    };
+
+    private final PackageMonitor mSettingsPackageMonitor = new PackageMonitor() {
+        @Override
+        public void onPackageAdded(String packageName, int uid) {
+            sendUpdate();
+        }
+
+        @Override
+        public void onPackageAppeared(String packageName, int reason) {
+            sendUpdate();
+        }
+
+        @Override
+        public void onPackageDisappeared(String packageName, int reason) {
+            sendUpdate();
+        }
+
+        @Override
+        public void onPackageRemoved(String packageName, int uid) {
+            sendUpdate();
+        }
+
+        private void sendUpdate() {
+            mHandler.postDelayed(mUpdateRunnable, DELAY_UPDATE_SERVICES_MILLIS);
+        }
+    };
+
+    private final SettingsContentObserver mSettingsContentObserver =
+            new SettingsContentObserver(mHandler) {
+                @Override
+                public void onChange(boolean selfChange, Uri uri) {
+                    loadInstalledServices();
+                    updateServicesPreferences();
+                }
+            };
+
+    private final RotationPolicyListener mRotationPolicyListener = new RotationPolicyListener() {
+        @Override
+        public void onChange() {
+            updateLockScreenRotationCheckbox();
+        }
+    };
+
+    // Preference controls.
+    private PreferenceCategory mServicesCategory;
+    private PreferenceCategory mSystemsCategory;
+
+    private CheckBoxPreference mToggleLargeTextPreference;
+    private CheckBoxPreference mTogglePowerButtonEndsCallPreference;
+    private CheckBoxPreference mToggleLockScreenRotationPreference;
+    private CheckBoxPreference mToggleSpeakPasswordPreference;
+    private ListPreference mSelectLongPressTimeoutPreference;
+    private Preference mNoServicesMessagePreference;
+    private PreferenceScreen mCaptioningPreferenceScreen;
+    private PreferenceScreen mDisplayMagnificationPreferenceScreen;
+    private PreferenceScreen mGlobalGesturePreferenceScreen;
+
+    private int mLongPressTimeoutDefault;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        addPreferencesFromResource(R.xml.accessibility_settings);
+        initializeAllPreferences();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        loadInstalledServices();
+        updateAllPreferences();
+
+        offerInstallAccessibilitySerivceOnce();
+
+        mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
+        mSettingsContentObserver.register(getContentResolver());
+        if (RotationPolicy.isRotationSupported(getActivity())) {
+            RotationPolicy.registerRotationPolicyListener(getActivity(),
+                    mRotationPolicyListener);
+        }
+    }
+
+    @Override
+    public void onPause() {
+        mSettingsPackageMonitor.unregister();
+        mSettingsContentObserver.unregister(getContentResolver());
+        if (RotationPolicy.isRotationSupported(getActivity())) {
+            RotationPolicy.unregisterRotationPolicyListener(getActivity(),
+                    mRotationPolicyListener);
+        }
+        super.onPause();
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (preference == mSelectLongPressTimeoutPreference) {
+            String stringValue = (String) newValue;
+            Settings.Secure.putInt(getContentResolver(),
+                    Settings.Secure.LONG_PRESS_TIMEOUT, Integer.parseInt(stringValue));
+            mSelectLongPressTimeoutPreference.setSummary(
+                    mLongPressTimeoutValuetoTitleMap.get(stringValue));
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        if (mToggleLargeTextPreference == preference) {
+            handleToggleLargeTextPreferenceClick();
+            return true;
+        } else if (mTogglePowerButtonEndsCallPreference == preference) {
+            handleTogglePowerButtonEndsCallPreferenceClick();
+            return true;
+        } else if (mToggleLockScreenRotationPreference == preference) {
+            handleLockScreenRotationPreferenceClick();
+            return true;
+        } else if (mToggleSpeakPasswordPreference == preference) {
+            handleToggleSpeakPasswordPreferenceClick();
+            return true;
+        } else if (mGlobalGesturePreferenceScreen == preference) {
+            handleTogglEnableAccessibilityGesturePreferenceClick();
+            return true;
+        } else if (mDisplayMagnificationPreferenceScreen == preference) {
+            handleDisplayMagnificationPreferenceScreenClick();
+            return true;
+        }
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
+    }
+
+    private void handleToggleLargeTextPreferenceClick() {
+        try {
+            mCurConfig.fontScale = mToggleLargeTextPreference.isChecked() ? LARGE_FONT_SCALE : 1;
+            ActivityManagerNative.getDefault().updatePersistentConfiguration(mCurConfig);
+        } catch (RemoteException re) {
+            /* ignore */
+        }
+    }
+
+    private void handleTogglePowerButtonEndsCallPreferenceClick() {
+        Settings.Secure.putInt(getContentResolver(),
+                Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
+                (mTogglePowerButtonEndsCallPreference.isChecked()
+                        ? Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP
+                        : Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF));
+    }
+
+    private void handleLockScreenRotationPreferenceClick() {
+        RotationPolicy.setRotationLockForAccessibility(getActivity(),
+                !mToggleLockScreenRotationPreference.isChecked());
+    }
+
+    private void handleToggleSpeakPasswordPreferenceClick() {
+        Settings.Secure.putInt(getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD,
+                mToggleSpeakPasswordPreference.isChecked() ? 1 : 0);
+    }
+
+    private void handleTogglEnableAccessibilityGesturePreferenceClick() {
+        Bundle extras = mGlobalGesturePreferenceScreen.getExtras();
+        extras.putString(EXTRA_TITLE, getString(
+                R.string.accessibility_global_gesture_preference_title));
+        extras.putString(EXTRA_SUMMARY, getString(
+                R.string.accessibility_global_gesture_preference_description));
+        extras.putBoolean(EXTRA_CHECKED, Settings.Global.getInt(getContentResolver(),
+                Settings.Global.ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED, 0) == 1);
+        super.onPreferenceTreeClick(mGlobalGesturePreferenceScreen,
+                mGlobalGesturePreferenceScreen);
+    }
+
+    private void handleDisplayMagnificationPreferenceScreenClick() {
+        Bundle extras = mDisplayMagnificationPreferenceScreen.getExtras();
+        extras.putString(EXTRA_TITLE, getString(
+                R.string.accessibility_screen_magnification_title));
+        extras.putCharSequence(EXTRA_SUMMARY, getActivity().getResources().getText(
+                R.string.accessibility_screen_magnification_summary));
+        extras.putBoolean(EXTRA_CHECKED, Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1);
+        super.onPreferenceTreeClick(mDisplayMagnificationPreferenceScreen,
+                mDisplayMagnificationPreferenceScreen);
+    }
+
+    private void initializeAllPreferences() {
+        mServicesCategory = (PreferenceCategory) findPreference(SERVICES_CATEGORY);
+        mSystemsCategory = (PreferenceCategory) findPreference(SYSTEM_CATEGORY);
+
+        // Large text.
+        mToggleLargeTextPreference =
+                (CheckBoxPreference) findPreference(TOGGLE_LARGE_TEXT_PREFERENCE);
+
+        // Power button ends calls.
+        mTogglePowerButtonEndsCallPreference =
+                (CheckBoxPreference) findPreference(TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE);
+        if (!KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
+                || !Utils.isVoiceCapable(getActivity())) {
+            mSystemsCategory.removePreference(mTogglePowerButtonEndsCallPreference);
+        }
+
+        // Lock screen rotation.
+        mToggleLockScreenRotationPreference =
+                (CheckBoxPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE);
+        if (!RotationPolicy.isRotationSupported(getActivity())) {
+            mSystemsCategory.removePreference(mToggleLockScreenRotationPreference);
+        }
+
+        // Speak passwords.
+        mToggleSpeakPasswordPreference =
+                (CheckBoxPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE);
+
+        // Long press timeout.
+        mSelectLongPressTimeoutPreference =
+                (ListPreference) findPreference(SELECT_LONG_PRESS_TIMEOUT_PREFERENCE);
+        mSelectLongPressTimeoutPreference.setOnPreferenceChangeListener(this);
+        if (mLongPressTimeoutValuetoTitleMap.size() == 0) {
+            String[] timeoutValues = getResources().getStringArray(
+                    R.array.long_press_timeout_selector_values);
+            mLongPressTimeoutDefault = Integer.parseInt(timeoutValues[0]);
+            String[] timeoutTitles = getResources().getStringArray(
+                    R.array.long_press_timeout_selector_titles);
+            final int timeoutValueCount = timeoutValues.length;
+            for (int i = 0; i < timeoutValueCount; i++) {
+                mLongPressTimeoutValuetoTitleMap.put(timeoutValues[i], timeoutTitles[i]);
+            }
+        }
+
+        // Captioning.
+        mCaptioningPreferenceScreen = (PreferenceScreen) findPreference(
+                CAPTIONING_PREFERENCE_SCREEN);
+
+        // Display magnification.
+        mDisplayMagnificationPreferenceScreen = (PreferenceScreen) findPreference(
+                DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN);
+
+        // Global gesture.
+        mGlobalGesturePreferenceScreen =
+                (PreferenceScreen) findPreference(ENABLE_ACCESSIBILITY_GESTURE_PREFERENCE_SCREEN);
+        final int longPressOnPowerBehavior = getActivity().getResources().getInteger(
+                com.android.internal.R.integer.config_longPressOnPowerBehavior);
+        final int LONG_PRESS_POWER_GLOBAL_ACTIONS = 1;
+        if (!KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
+                || longPressOnPowerBehavior != LONG_PRESS_POWER_GLOBAL_ACTIONS) {
+            // Remove accessibility shortcut if power key is not present
+            // nor long press power does not show global actions menu.
+            mSystemsCategory.removePreference(mGlobalGesturePreferenceScreen);
+        }
+    }
+
+    private void updateAllPreferences() {
+        updateServicesPreferences();
+        updateSystemPreferences();
+    }
+
+    private void updateServicesPreferences() {
+        // Since services category is auto generated we have to do a pass
+        // to generate it since services can come and go and then based on
+        // the global accessibility state to decided whether it is enabled.
+
+        // Generate.
+        mServicesCategory.removeAll();
+
+        AccessibilityManager accessibilityManager = AccessibilityManager.getInstance(getActivity());
+
+        List<AccessibilityServiceInfo> installedServices =
+                accessibilityManager.getInstalledAccessibilityServiceList();
+        Set<ComponentName> enabledServices = AccessibilityUtils.getEnabledServicesFromSettings(
+                getActivity());
+
+        final boolean accessibilityEnabled = Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_ENABLED, 0) == 1;
+
+        for (int i = 0, count = installedServices.size(); i < count; ++i) {
+            AccessibilityServiceInfo info = installedServices.get(i);
+
+            PreferenceScreen preference = getPreferenceManager().createPreferenceScreen(
+                    getActivity());
+            String title = info.getResolveInfo().loadLabel(getPackageManager()).toString();
+
+            ServiceInfo serviceInfo = info.getResolveInfo().serviceInfo;
+            ComponentName componentName = new ComponentName(serviceInfo.packageName,
+                    serviceInfo.name);
+
+            preference.setKey(componentName.flattenToString());
+
+            preference.setTitle(title);
+            final boolean serviceEnabled = accessibilityEnabled
+                    && enabledServices.contains(componentName);
+            if (serviceEnabled) {
+                preference.setSummary(getString(R.string.accessibility_feature_state_on));
+            } else {
+                preference.setSummary(getString(R.string.accessibility_feature_state_off));
+            }
+
+            preference.setOrder(i);
+            preference.setFragment(ToggleAccessibilityServicePreferenceFragment.class.getName());
+            preference.setPersistent(true);
+
+            Bundle extras = preference.getExtras();
+            extras.putString(EXTRA_PREFERENCE_KEY, preference.getKey());
+            extras.putBoolean(EXTRA_CHECKED, serviceEnabled);
+            extras.putString(EXTRA_TITLE, title);
+
+            String description = info.loadDescription(getPackageManager());
+            if (TextUtils.isEmpty(description)) {
+                description = getString(R.string.accessibility_service_default_description);
+            }
+            extras.putString(EXTRA_SUMMARY, description);
+
+            String settingsClassName = info.getSettingsActivityName();
+            if (!TextUtils.isEmpty(settingsClassName)) {
+                extras.putString(EXTRA_SETTINGS_TITLE,
+                        getString(R.string.accessibility_menu_item_settings));
+                extras.putString(EXTRA_SETTINGS_COMPONENT_NAME,
+                        new ComponentName(info.getResolveInfo().serviceInfo.packageName,
+                                settingsClassName).flattenToString());
+            }
+
+            extras.putParcelable(EXTRA_COMPONENT_NAME, componentName);
+
+            mServicesCategory.addPreference(preference);
+        }
+
+        if (mServicesCategory.getPreferenceCount() == 0) {
+            if (mNoServicesMessagePreference == null) {
+                mNoServicesMessagePreference = new Preference(getActivity()) {
+                        @Override
+                    protected void onBindView(View view) {
+                        super.onBindView(view);
+                        TextView summaryView = (TextView) view.findViewById(R.id.summary);
+                        String title = getString(R.string.accessibility_no_services_installed);
+                        summaryView.setText(title);
+                    }
+                };
+                mNoServicesMessagePreference.setPersistent(false);
+                mNoServicesMessagePreference.setLayoutResource(
+                        R.layout.text_description_preference);
+                mNoServicesMessagePreference.setSelectable(false);
+            }
+            mServicesCategory.addPreference(mNoServicesMessagePreference);
+        }
+    }
+
+    private void updateSystemPreferences() {
+        // Large text.
+        try {
+            mCurConfig.updateFrom(ActivityManagerNative.getDefault().getConfiguration());
+        } catch (RemoteException re) {
+            /* ignore */
+        }
+        mToggleLargeTextPreference.setChecked(mCurConfig.fontScale == LARGE_FONT_SCALE);
+
+        // Power button ends calls.
+        if (KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
+                && Utils.isVoiceCapable(getActivity())) {
+            final int incallPowerBehavior = Settings.Secure.getInt(getContentResolver(),
+                    Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
+                    Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT);
+            final boolean powerButtonEndsCall =
+                    (incallPowerBehavior == Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP);
+            mTogglePowerButtonEndsCallPreference.setChecked(powerButtonEndsCall);
+        }
+
+        // Auto-rotate screen
+        updateLockScreenRotationCheckbox();
+
+        // Speak passwords.
+        final boolean speakPasswordEnabled = Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0) != 0;
+        mToggleSpeakPasswordPreference.setChecked(speakPasswordEnabled);
+
+        // Long press timeout.
+        final int longPressTimeout = Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.LONG_PRESS_TIMEOUT, mLongPressTimeoutDefault);
+        String value = String.valueOf(longPressTimeout);
+        mSelectLongPressTimeoutPreference.setValue(value);
+        mSelectLongPressTimeoutPreference.setSummary(mLongPressTimeoutValuetoTitleMap.get(value));
+
+        // Captioning.
+        final boolean captioningEnabled = Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, 0) == 1;
+        if (captioningEnabled) {
+            mCaptioningPreferenceScreen.setSummary(R.string.accessibility_feature_state_on);
+        } else {
+            mCaptioningPreferenceScreen.setSummary(R.string.accessibility_feature_state_off);
+        }
+
+        // Screen magnification.
+        final boolean magnificationEnabled = Settings.Secure.getInt(getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1;
+        if (magnificationEnabled) {
+            mDisplayMagnificationPreferenceScreen.setSummary(
+                    R.string.accessibility_feature_state_on);
+        } else {
+            mDisplayMagnificationPreferenceScreen.setSummary(
+                    R.string.accessibility_feature_state_off);
+        }
+
+        // Global gesture
+        final boolean globalGestureEnabled = Settings.Global.getInt(getContentResolver(),
+                Settings.Global.ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED, 0) == 1;
+        if (globalGestureEnabled) {
+            mGlobalGesturePreferenceScreen.setSummary(
+                    R.string.accessibility_global_gesture_preference_summary_on);
+        } else {
+            mGlobalGesturePreferenceScreen.setSummary(
+                    R.string.accessibility_global_gesture_preference_summary_off);
+        }
+    }
+
+    private void updateLockScreenRotationCheckbox() {
+        Context context = getActivity();
+        if (context != null) {
+            mToggleLockScreenRotationPreference.setChecked(
+                    !RotationPolicy.isRotationLocked(context));
+        }
+    }
+
+    private void offerInstallAccessibilitySerivceOnce() {
+        // There is always one preference - if no services it is just a message.
+        if (mServicesCategory.getPreference(0) != mNoServicesMessagePreference) {
+            return;
+        }
+        SharedPreferences preferences = getActivity().getPreferences(Context.MODE_PRIVATE);
+        final boolean offerInstallService = !preferences.getBoolean(
+                KEY_INSTALL_ACCESSIBILITY_SERVICE_OFFERED_ONCE, false);
+        if (offerInstallService) {
+            String screenreaderMarketLink = SystemProperties.get(
+                    SYSTEM_PROPERTY_MARKET_URL,
+                    DEFAULT_SCREENREADER_MARKET_LINK);
+            Uri marketUri = Uri.parse(screenreaderMarketLink);
+            Intent marketIntent = new Intent(Intent.ACTION_VIEW, marketUri);
+
+            if (getPackageManager().resolveActivity(marketIntent, 0) == null) {
+                // Don't show the dialog if no market app is found/installed.
+                return;
+            }
+
+            preferences.edit().putBoolean(KEY_INSTALL_ACCESSIBILITY_SERVICE_OFFERED_ONCE,
+                    true).commit();
+            // Notify user that they do not have any accessibility
+            // services installed and direct them to Market to get TalkBack.
+            showDialog(DIALOG_ID_NO_ACCESSIBILITY_SERVICES);
+        }
+    }
+
+    @Override
+    public Dialog onCreateDialog(int dialogId) {
+        switch (dialogId) {
+            case DIALOG_ID_NO_ACCESSIBILITY_SERVICES:
+                return new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.accessibility_service_no_apps_title)
+                        .setMessage(R.string.accessibility_service_no_apps_message)
+                        .setPositiveButton(android.R.string.ok,
+                                new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        // dismiss the dialog before launching
+                                        // the activity otherwise the dialog
+                                        // removal occurs after
+                                        // onSaveInstanceState which triggers an
+                                        // exception
+                                        removeDialog(DIALOG_ID_NO_ACCESSIBILITY_SERVICES);
+                                        String screenreaderMarketLink = SystemProperties.get(
+                                                SYSTEM_PROPERTY_MARKET_URL,
+                                                DEFAULT_SCREENREADER_MARKET_LINK);
+                                        Uri marketUri = Uri.parse(screenreaderMarketLink);
+                                        Intent marketIntent = new Intent(Intent.ACTION_VIEW,
+                                                marketUri);
+                                        try {
+                                            startActivity(marketIntent);
+                                        } catch (ActivityNotFoundException anfe) {
+                                            Log.w(LOG_TAG, "Couldn't start play store activity",
+                                                    anfe);
+                                        }
+                                    }
+                                })
+                        .setNegativeButton(android.R.string.cancel, null)
+                        .create();
+            default:
+                return null;
+        }
+    }
+
+    private void loadInstalledServices() {
+        Set<ComponentName> installedServices = sInstalledServices;
+        installedServices.clear();
+
+        List<AccessibilityServiceInfo> installedServiceInfos =
+                AccessibilityManager.getInstance(getActivity())
+                        .getInstalledAccessibilityServiceList();
+        if (installedServiceInfos == null) {
+            return;
+        }
+
+        final int installedServiceInfoCount = installedServiceInfos.size();
+        for (int i = 0; i < installedServiceInfoCount; i++) {
+            ResolveInfo resolveInfo = installedServiceInfos.get(i).getResolveInfo();
+            ComponentName installedService = new ComponentName(
+                    resolveInfo.serviceInfo.packageName,
+                    resolveInfo.serviceInfo.name);
+            installedServices.add(installedService);
+        }
+    }
+}
diff --git a/src/com/android/settings/accessibility/AccessibilityUtils.java b/src/com/android/settings/accessibility/AccessibilityUtils.java
new file mode 100644
index 00000000000..7282bce827e
--- /dev/null
+++ b/src/com/android/settings/accessibility/AccessibilityUtils.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.provider.Settings;
+import android.text.TextUtils.SimpleStringSplitter;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+
+/**
+ * Utility methods used within accessibility settings.
+ */
+class AccessibilityUtils {
+    /**
+     * @return the set of enabled accessibility services. If there are not services
+     * it returned the unmodifiable {@link Collections#emptySet()}.
+     */
+    static Set<ComponentName> getEnabledServicesFromSettings(Context context) {
+        final String enabledServicesSetting = Settings.Secure.getString(
+                context.getContentResolver(), Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
+        if (enabledServicesSetting == null) {
+            return Collections.emptySet();
+        }
+
+        final Set<ComponentName> enabledServices = new HashSet<ComponentName>();
+        final SimpleStringSplitter colonSplitter = AccessibilitySettings.sStringColonSplitter;
+        colonSplitter.setString(enabledServicesSetting);
+
+        while (colonSplitter.hasNext()) {
+            final String componentNameString = colonSplitter.next();
+            final ComponentName enabledService = ComponentName.unflattenFromString(
+                    componentNameString);
+            if (enabledService != null) {
+                enabledServices.add(enabledService);
+            }
+        }
+
+        return enabledServices;
+    }
+
+    /**
+     * @return a localized version of the text resource specified by resId
+     */
+    static CharSequence getTextForLocale(Context context, Locale locale, int resId) {
+        final Resources res = context.getResources();
+        final Configuration config = res.getConfiguration();
+        final Locale prevLocale = config.locale;
+        try {
+            config.locale = locale;
+            res.updateConfiguration(config, null);
+            return res.getText(resId);
+        } finally {
+            config.locale = prevLocale;
+            res.updateConfiguration(config, null);
+        }
+    }
+}
diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
new file mode 100644
index 00000000000..b010ca8c8c1
--- /dev/null
+++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.provider.Settings;
+import android.view.accessibility.CaptioningManager;
+import android.view.accessibility.CaptioningManager.CaptionStyle;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.accessibility.ListDialogPreference.OnValueChangedListener;
+
+/**
+ * Settings fragment containing captioning properties.
+ */
+public class CaptionPropertiesFragment extends SettingsPreferenceFragment
+        implements OnPreferenceChangeListener, OnValueChangedListener {
+    private ToggleCaptioningPreferenceFragment mParent;
+    private CaptioningManager mCaptioningManager;
+
+    // Standard options.
+    private LocalePreference mLocale;
+    private ListPreference mFontSize;
+    private PresetPreference mPreset;
+
+    // Custom options.
+    private ListPreference mTypeface;
+    private ColorPreference mForegroundColor;
+    private EdgeTypePreference mEdgeType;
+    private ColorPreference mEdgeColor;
+    private ColorPreference mBackgroundColor;
+    private ColorPreference mBackgroundOpacity;
+    private PreferenceCategory mCustom;
+
+    private boolean mShowingCustom;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mCaptioningManager = (CaptioningManager) getSystemService(Context.CAPTIONING_SERVICE);
+
+        addPreferencesFromResource(R.xml.captioning_settings);
+        initializeAllPreferences();
+        updateAllPreferences();
+        refreshShowingCustom();
+        installUpdateListeners();
+    }
+
+    /**
+     * Sets the parent fragment, which is used to update the live preview.
+     *
+     * @param parent the parent fragment
+     */
+    public void setParent(ToggleCaptioningPreferenceFragment parent) {
+        mParent = parent;
+    }
+
+    private void initializeAllPreferences() {
+        mLocale = (LocalePreference) findPreference("captioning_locale");
+        mFontSize = (ListPreference) findPreference("captioning_font_size");
+
+        final Resources res = getResources();
+        final int[] presetValues = res.getIntArray(R.array.captioning_preset_selector_values);
+        final String[] presetTitles = res.getStringArray(R.array.captioning_preset_selector_titles);
+        mPreset = (PresetPreference) findPreference("captioning_preset");
+        mPreset.setValues(presetValues);
+        mPreset.setTitles(presetTitles);
+
+        mCustom = (PreferenceCategory) findPreference("custom");
+        mShowingCustom = true;
+
+        final int[] colorValues = res.getIntArray(R.array.captioning_color_selector_values);
+        final String[] colorTitles = res.getStringArray(R.array.captioning_color_selector_titles);
+        mForegroundColor = (ColorPreference) mCustom.findPreference("captioning_foreground_color");
+        mForegroundColor.setTitles(colorTitles);
+        mForegroundColor.setValues(colorValues);
+        mEdgeColor = (ColorPreference) mCustom.findPreference("captioning_edge_color");
+        mEdgeColor.setTitles(colorTitles);
+        mEdgeColor.setValues(colorValues);
+
+        // Add "none" as an additional option for backgrounds.
+        final int[] bgColorValues = new int[colorValues.length + 1];
+        final String[] bgColorTitles = new String[colorTitles.length + 1];
+        System.arraycopy(colorValues, 0, bgColorValues, 1, colorValues.length);
+        System.arraycopy(colorTitles, 0, bgColorTitles, 1, colorTitles.length);
+        bgColorValues[0] = Color.TRANSPARENT;
+        bgColorTitles[0] = getString(R.string.color_none);
+        mBackgroundColor = (ColorPreference) mCustom.findPreference("captioning_background_color");
+        mBackgroundColor.setTitles(bgColorTitles);
+        mBackgroundColor.setValues(bgColorValues);
+
+        final int[] opacityValues = res.getIntArray(R.array.captioning_opacity_selector_values);
+        final String[] opacityTitles = res.getStringArray(
+                R.array.captioning_opacity_selector_titles);
+        mBackgroundOpacity = (ColorPreference) mCustom.findPreference(
+                "captioning_background_opacity");
+        mBackgroundOpacity.setTitles(opacityTitles);
+        mBackgroundOpacity.setValues(opacityValues);
+
+        mEdgeType = (EdgeTypePreference) mCustom.findPreference("captioning_edge_type");
+        mTypeface = (ListPreference) mCustom.findPreference("captioning_typeface");
+    }
+
+    private void installUpdateListeners() {
+        mPreset.setOnValueChangedListener(this);
+        mForegroundColor.setOnValueChangedListener(this);
+        mEdgeColor.setOnValueChangedListener(this);
+        mBackgroundColor.setOnValueChangedListener(this);
+        mBackgroundOpacity.setOnValueChangedListener(this);
+        mEdgeType.setOnValueChangedListener(this);
+
+        mTypeface.setOnPreferenceChangeListener(this);
+        mFontSize.setOnPreferenceChangeListener(this);
+        mLocale.setOnPreferenceChangeListener(this);
+    }
+
+    private void updateAllPreferences() {
+        final int preset = mCaptioningManager.getRawUserStyle();
+        mPreset.setValue(preset);
+
+        final float fontSize = mCaptioningManager.getFontScale();
+        mFontSize.setValue(Float.toString(fontSize));
+
+        final ContentResolver cr = getContentResolver();
+        final CaptionStyle attrs = CaptionStyle.getCustomStyle(cr);
+        mForegroundColor.setValue(attrs.foregroundColor);
+        mEdgeType.setValue(attrs.edgeType);
+        mEdgeColor.setValue(attrs.edgeColor);
+
+        final int backgroundColor = attrs.backgroundColor;
+        final int bgColor;
+        final int bgAlpha;
+        if (Color.alpha(backgroundColor) == 0) {
+            bgColor = Color.TRANSPARENT;
+            bgAlpha = (backgroundColor & 0xFF) << 24;
+        } else {
+            bgColor = backgroundColor | 0xFF000000;
+            bgAlpha = backgroundColor & 0xFF000000;
+        }
+        mBackgroundColor.setValue(bgColor);
+        mBackgroundOpacity.setValue(bgAlpha | 0xFFFFFF);
+
+        final String rawTypeface = attrs.mRawTypeface;
+        mTypeface.setValue(rawTypeface == null ? "" : rawTypeface);
+
+        final String rawLocale = mCaptioningManager.getRawLocale();
+        mLocale.setValue(rawLocale == null ? "" : rawLocale);
+    }
+
+    private void refreshPreviewText() {
+        if (mParent != null) {
+            mParent.refreshPreviewText();
+        }
+    }
+
+    private void refreshShowingCustom() {
+        final boolean customPreset = mPreset.getValue() == CaptionStyle.PRESET_CUSTOM;
+        if (!customPreset && mShowingCustom) {
+            getPreferenceScreen().removePreference(mCustom);
+            mShowingCustom = false;
+        } else if (customPreset && !mShowingCustom) {
+            getPreferenceScreen().addPreference(mCustom);
+            mShowingCustom = true;
+        }
+    }
+
+    @Override
+    public void onValueChanged(ListDialogPreference preference, int value) {
+        final ContentResolver cr = getActivity().getContentResolver();
+        if (mForegroundColor == preference) {
+            Settings.Secure.putInt(
+                    cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_FOREGROUND_COLOR, value);
+        } else if (mBackgroundColor == preference || mBackgroundOpacity == preference) {
+            final int bgColor = mBackgroundColor.getValue();
+            final int bgAlpha = mBackgroundOpacity.getValue();
+            final int argb;
+            if (Color.alpha(bgColor) == 0) {
+                argb = Color.alpha(bgAlpha);
+            } else {
+                argb = bgColor & 0x00FFFFFF | bgAlpha & 0xFF000000;
+            }
+            Settings.Secure.putInt(
+                    cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_BACKGROUND_COLOR, argb);
+        } else if (mEdgeColor == preference) {
+            Settings.Secure.putInt(cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_EDGE_COLOR, value);
+        } else if (mPreset == preference) {
+            Settings.Secure.putInt(cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_PRESET, value);
+            refreshShowingCustom();
+        } else if (mEdgeType == preference) {
+            Settings.Secure.putInt(cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_EDGE_TYPE, value);
+        }
+
+        refreshPreviewText();
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object value) {
+        final ContentResolver cr = getActivity().getContentResolver();
+        if (mTypeface == preference) {
+            Settings.Secure.putString(
+                    cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_TYPEFACE, (String) value);
+        } else if (mFontSize == preference) {
+            Settings.Secure.putFloat(
+                    cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_FONT_SCALE,
+                    Float.parseFloat((String) value));
+        } else if (mLocale == preference) {
+            Settings.Secure.putString(
+                    cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_LOCALE, (String) value);
+        }
+
+        refreshPreviewText();
+        return true;
+    }
+}
diff --git a/src/com/android/settings/accessibility/ColorPreference.java b/src/com/android/settings/accessibility/ColorPreference.java
new file mode 100644
index 00000000000..f4a5ba7fa1e
--- /dev/null
+++ b/src/com/android/settings/accessibility/ColorPreference.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.settings.R;
+
+/**
+ * Grid preference that allows the user to pick a color from a predefined set of
+ * colors. Optionally shows a preview in the preference item.
+ */
+public class ColorPreference extends ListDialogPreference {
+    private ColorDrawable mPreviewColor;
+    private boolean mPreviewEnabled;
+
+    public ColorPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        setDialogLayoutResource(R.layout.grid_picker_dialog);
+        setListItemLayoutResource(R.layout.color_picker_item);
+    }
+
+    /**
+     * @param enabled whether to show a preview in the preference item
+     */
+    public void setPreviewEnabled(boolean enabled) {
+        if (mPreviewEnabled != enabled) {
+            mPreviewEnabled = enabled;
+
+            if (enabled) {
+                setWidgetLayoutResource(R.layout.preference_color);
+            } else {
+                setWidgetLayoutResource(0);
+            }
+        }
+    }
+
+    @Override
+    public boolean shouldDisableDependents() {
+        return getValue() == Color.TRANSPARENT || super.shouldDisableDependents();
+    }
+
+    @Override
+    protected CharSequence getTitleAt(int index) {
+        final CharSequence title = super.getTitleAt(index);
+        if (title != null) {
+            return title;
+        }
+
+        // If no title was supplied, format title using RGB values.
+        final int value = getValueAt(index);
+        final int r = Color.red(value);
+        final int g = Color.green(value);
+        final int b = Color.blue(value);
+        return getContext().getString(R.string.color_custom, r, g, b);
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        if (mPreviewEnabled) {
+            final ImageView previewImage = (ImageView) view.findViewById(R.id.color_preview);
+            final int argb = getValue();
+            if (Color.alpha(argb) < 255) {
+                previewImage.setBackgroundResource(R.drawable.transparency_tileable);
+            } else {
+                previewImage.setBackground(null);
+            }
+
+            if (mPreviewColor == null) {
+                mPreviewColor = new ColorDrawable(argb);
+                previewImage.setImageDrawable(mPreviewColor);
+            } else {
+                mPreviewColor.setColor(argb);
+            }
+
+            final CharSequence summary = getSummary();
+            if (!TextUtils.isEmpty(summary)) {
+                previewImage.setContentDescription(summary);
+            } else {
+                previewImage.setContentDescription(null);
+            }
+
+            previewImage.setAlpha(isEnabled() ? 1f : 0.2f);
+        }
+    }
+
+    @Override
+    protected void onBindListItem(View view, int index) {
+        final int argb = getValueAt(index);
+        final int alpha = Color.alpha(argb);
+
+        final ImageView swatch = (ImageView) view.findViewById(R.id.color_swatch);
+        if (alpha < 255) {
+            swatch.setBackgroundResource(R.drawable.transparency_tileable);
+        } else {
+            swatch.setBackground(null);
+        }
+
+        final Drawable foreground = swatch.getDrawable();
+        if (foreground instanceof ColorDrawable) {
+            ((ColorDrawable) foreground).setColor(argb);
+        } else {
+            swatch.setImageDrawable(new ColorDrawable(argb));
+        }
+
+        final CharSequence title = getTitleAt(index);
+        if (title != null) {
+            final TextView summary = (TextView) view.findViewById(R.id.summary);
+            summary.setText(title);
+        }
+    }
+}
diff --git a/src/com/android/settings/accessibility/EdgeTypePreference.java b/src/com/android/settings/accessibility/EdgeTypePreference.java
new file mode 100644
index 00000000000..ad71a765c7c
--- /dev/null
+++ b/src/com/android/settings/accessibility/EdgeTypePreference.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.accessibility.CaptioningManager.CaptionStyle;
+import android.widget.TextView;
+
+import com.android.internal.widget.SubtitleView;
+import com.android.settings.R;
+
+/**
+ * Grid preference that allows the user to pick a captioning edge type.
+ */
+public class EdgeTypePreference extends ListDialogPreference {
+    private static final int DEFAULT_FOREGROUND_COLOR = Color.WHITE;
+    private static final int DEFAULT_BACKGROUND_COLOR = Color.TRANSPARENT;
+    private static final int DEFAULT_EDGE_COLOR = Color.BLACK;
+    private static final float DEFAULT_FONT_SIZE = 96f;
+
+    public EdgeTypePreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        final Resources res = context.getResources();
+        setValues(res.getIntArray(R.array.captioning_edge_type_selector_values));
+        setTitles(res.getStringArray(R.array.captioning_edge_type_selector_titles));
+        setDialogLayoutResource(R.layout.grid_picker_dialog);
+        setListItemLayoutResource(R.layout.preset_picker_item);
+    }
+
+    @Override
+    public boolean shouldDisableDependents() {
+        return getValue() == CaptionStyle.EDGE_TYPE_NONE || super.shouldDisableDependents();
+    }
+
+    @Override
+    protected void onBindListItem(View view, int index) {
+        final SubtitleView preview = (SubtitleView) view.findViewById(R.id.preview);
+
+        preview.setForegroundColor(DEFAULT_FOREGROUND_COLOR);
+        preview.setBackgroundColor(DEFAULT_BACKGROUND_COLOR);
+        preview.setTextSize(DEFAULT_FONT_SIZE);
+
+        final int value = getValueAt(index);
+        preview.setEdgeType(value);
+        preview.setEdgeColor(DEFAULT_EDGE_COLOR);
+
+        final CharSequence title = getTitleAt(index);
+        if (title != null) {
+            final TextView summary = (TextView) view.findViewById(R.id.summary);
+            summary.setText(title);
+        }
+    }
+}
diff --git a/src/com/android/settings/accessibility/ListDialogPreference.java b/src/com/android/settings/accessibility/ListDialogPreference.java
new file mode 100644
index 00000000000..a25245413a4
--- /dev/null
+++ b/src/com/android/settings/accessibility/ListDialogPreference.java
@@ -0,0 +1,322 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.app.AlertDialog.Builder;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.preference.DialogPreference;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AbsListView;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.BaseAdapter;
+
+/**
+ * Abstract dialog preference that displays a set of values and optional titles.
+ */
+public abstract class ListDialogPreference extends DialogPreference {
+    private CharSequence[] mEntryTitles;
+    private int[] mEntryValues;
+
+    private OnValueChangedListener mOnValueChangedListener;
+
+    /** The layout resource to use for grid items. */
+    private int mListItemLayout;
+
+    /** The current value of this preference. */
+    private int mValue;
+
+    /** The index within the value set of the current value. */
+    private int mValueIndex;
+
+    /** Whether the value had been set using {@link #setValue}. */
+    private boolean mValueSet;
+
+    public ListDialogPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    /**
+     * Sets a listened to invoke when the value of this preference changes.
+     *
+     * @param listener the listener to invoke
+     */
+    public void setOnValueChangedListener(OnValueChangedListener listener) {
+        mOnValueChangedListener = listener;
+    }
+
+    /**
+     * Sets the layout to use for grid items.
+     *
+     * @param layoutResId the layout to use for displaying grid items
+     */
+    public void setListItemLayoutResource(int layoutResId) {
+        mListItemLayout = layoutResId;
+    }
+
+    /**
+     * Sets the list of item values. Values must be distinct.
+     *
+     * @param values the list of item values
+     */
+    public void setValues(int[] values) {
+        mEntryValues = values;
+    }
+
+    /**
+     * Sets the list of item titles. May be null if no titles are specified, or
+     * may be shorter than the list of values to leave some titles unspecified.
+     *
+     * @param titles the list of item titles
+     */
+    public void setTitles(CharSequence[] titles) {
+        mEntryTitles = titles;
+    }
+
+    /**
+     * Populates a list item view with data for the specified index.
+     *
+     * @param view the view to populate
+     * @param index the index for which to populate the view
+     * @see #setListItemLayoutResource(int)
+     * @see #getValueAt(int)
+     * @see #getTitleAt(int)
+     */
+    protected abstract void onBindListItem(View view, int index);
+
+    /**
+     * @return the title at the specified index, or null if none specified
+     */
+    protected CharSequence getTitleAt(int index) {
+        if (mEntryTitles == null || mEntryTitles.length <= index) {
+            return null;
+        }
+
+        return mEntryTitles[index];
+    }
+
+    /**
+     * @return the value at the specified index
+     */
+    protected int getValueAt(int index) {
+        return mEntryValues[index];
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        if (mValueIndex >= 0) {
+            return getTitleAt(mValueIndex);
+        }
+
+        return null;
+    }
+
+    @Override
+    protected void onPrepareDialogBuilder(Builder builder) {
+        super.onPrepareDialogBuilder(builder);
+
+        final Context context = getContext();
+        final int dialogLayout = getDialogLayoutResource();
+        final View picker = LayoutInflater.from(context).inflate(dialogLayout, null);
+        final ListPreferenceAdapter adapter = new ListPreferenceAdapter();
+        final AbsListView list = (AbsListView) picker.findViewById(android.R.id.list);
+        list.setAdapter(adapter);
+        list.setOnItemClickListener(new OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> adapter, View v, int position, long id) {
+                if (callChangeListener((int) id)) {
+                    setValue((int) id);
+                }
+
+                final Dialog dialog = getDialog();
+                if (dialog != null) {
+                    dialog.dismiss();
+                }
+            }
+        });
+
+        // Set initial selection.
+        final int selectedPosition = getIndexForValue(mValue);
+        if (selectedPosition != AbsListView.INVALID_POSITION) {
+            list.setSelection(selectedPosition);
+        }
+
+        builder.setView(picker);
+        builder.setPositiveButton(null, null);
+    }
+
+    /**
+     * @return the index of the specified value within the list of entry values,
+     *         or {@link AbsListView#INVALID_POSITION} if not found
+     */
+    protected int getIndexForValue(int value) {
+        final int[] values = mEntryValues;
+        final int count = values.length;
+        for (int i = 0; i < count; i++) {
+            if (values[i] == value) {
+                return i;
+            }
+        }
+
+        return AbsListView.INVALID_POSITION;
+    }
+
+    /**
+     * Sets the current value. If the value exists within the set of entry
+     * values, updates the selection index.
+     *
+     * @param value the value to set
+     */
+    public void setValue(int value) {
+        final boolean changed = mValue != value;
+        if (changed || !mValueSet) {
+            mValue = value;
+            mValueIndex = getIndexForValue(value);
+            mValueSet = true;
+            persistInt(value);
+            if (changed) {
+                notifyDependencyChange(shouldDisableDependents());
+                notifyChanged();
+            }
+            if (mOnValueChangedListener != null) {
+                mOnValueChangedListener.onValueChanged(this, value);
+            }
+        }
+    }
+
+    /**
+     * @return the current value
+     */
+    public int getValue() {
+        return mValue;
+    }
+
+    @Override
+    protected Object onGetDefaultValue(TypedArray a, int index) {
+        return a.getInt(index, 0);
+    }
+
+    @Override
+    protected void onSetInitialValue(boolean restoreValue, Object defaultValue) {
+        setValue(restoreValue ? getPersistedInt(mValue) : (Integer) defaultValue);
+    }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        final Parcelable superState = super.onSaveInstanceState();
+        if (isPersistent()) {
+            // No need to save instance state since it's persistent
+            return superState;
+        }
+
+        final SavedState myState = new SavedState(superState);
+        myState.value = getValue();
+        return myState;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable state) {
+        if (state == null || !state.getClass().equals(SavedState.class)) {
+            // Didn't save state for us in onSaveInstanceState
+            super.onRestoreInstanceState(state);
+            return;
+        }
+
+        SavedState myState = (SavedState) state;
+        super.onRestoreInstanceState(myState.getSuperState());
+        setValue(myState.value);
+    }
+
+    private class ListPreferenceAdapter extends BaseAdapter {
+        private LayoutInflater mInflater;
+
+        @Override
+        public int getCount() {
+            return mEntryValues.length;
+        }
+
+        @Override
+        public Integer getItem(int position) {
+            return mEntryValues[position];
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return mEntryValues[position];
+        }
+
+        @Override
+        public boolean hasStableIds() {
+            return true;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            if (convertView == null) {
+                if (mInflater == null) {
+                    mInflater = LayoutInflater.from(parent.getContext());
+                }
+                convertView = mInflater.inflate(mListItemLayout, parent, false);
+            }
+            onBindListItem(convertView, position);
+            return convertView;
+        }
+    }
+
+    private static class SavedState extends BaseSavedState {
+        public int value;
+
+        public SavedState(Parcel source) {
+            super(source);
+            value = source.readInt();
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            super.writeToParcel(dest, flags);
+            dest.writeInt(value);
+        }
+
+        public SavedState(Parcelable superState) {
+            super(superState);
+        }
+
+        @SuppressWarnings({ "hiding", "unused" })
+        public static final Creator<SavedState> CREATOR = new Creator<SavedState>() {
+            @Override
+            public SavedState createFromParcel(Parcel in) {
+                return new SavedState(in);
+            }
+
+            @Override
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+    }
+
+    public interface OnValueChangedListener {
+        public void onValueChanged(ListDialogPreference preference, int value);
+    }
+}
diff --git a/src/com/android/settings/accessibility/LocalePreference.java b/src/com/android/settings/accessibility/LocalePreference.java
new file mode 100644
index 00000000000..41cb1e5fa09
--- /dev/null
+++ b/src/com/android/settings/accessibility/LocalePreference.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.preference.ListPreference;
+import android.util.AttributeSet;
+
+import com.android.settings.R;
+
+import java.text.Collator;
+import java.util.Arrays;
+import java.util.Locale;
+
+/**
+ * List preference that allows the user to pick a locale from the list of
+ * supported device locales.
+ */
+public class LocalePreference extends ListPreference {
+    public LocalePreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public LocalePreference(Context context) {
+        super(context);
+        init(context);
+    }
+
+    public void init(Context context) {
+        final String[] systemLocales = Resources.getSystem().getAssets().getLocales();
+        Arrays.sort(systemLocales);
+
+        final Resources resources = context.getResources();
+        final String[] specialLocaleCodes = resources.getStringArray(
+                com.android.internal.R.array.special_locale_codes);
+        final String[] specialLocaleNames = resources.getStringArray(
+                com.android.internal.R.array.special_locale_names);
+
+        int finalSize = 0;
+
+        final int origSize = systemLocales.length;
+        final LocaleInfo[] localeInfos = new LocaleInfo[origSize];
+        for (int i = 0; i < origSize; i++) {
+            final String localeStr = systemLocales[i];
+            final int len = localeStr.length();
+            if (len != 5) {
+                continue;
+            }
+
+            final String language = localeStr.substring(0, 2);
+            final String country = localeStr.substring(3, 5);
+            final Locale l = new Locale(language, country);
+
+            if (finalSize == 0) {
+                localeInfos[finalSize++] = new LocaleInfo(l.getDisplayLanguage(l), l);
+            } else {
+                // check previous entry:
+                // same lang and a country -> upgrade to full name and
+                // insert ours with full name
+                // diff lang -> insert ours with lang-only name
+                final LocaleInfo previous = localeInfos[finalSize - 1];
+                if (previous.locale.getLanguage().equals(language)
+                        && !previous.locale.getLanguage().equals("zz")) {
+                    previous.label = getDisplayName(
+                            localeInfos[finalSize - 1].locale, specialLocaleCodes,
+                            specialLocaleNames);
+                    localeInfos[finalSize++] = new LocaleInfo(getDisplayName(l,
+                            specialLocaleCodes, specialLocaleNames), l);
+                } else {
+                    final String displayName;
+                    if (localeStr.equals("zz_ZZ")) {
+                        displayName = "[Developer] Accented English";
+                    } else if (localeStr.equals("zz_ZY")) {
+                        displayName = "[Developer] Fake Bi-Directional";
+                    } else {
+                        displayName = l.getDisplayLanguage(l);
+                    }
+                    localeInfos[finalSize++] = new LocaleInfo(displayName, l);
+                }
+            }
+        }
+
+        final CharSequence[] entries = new CharSequence[finalSize + 1];
+        final CharSequence[] entryValues = new CharSequence[finalSize + 1];
+        Arrays.sort(localeInfos, 0, finalSize);
+
+        entries[0] = resources.getString(R.string.locale_default);
+        entryValues[0] = "";
+
+        for (int i = 0; i < finalSize; i++) {
+            final LocaleInfo info = localeInfos[i];
+            entries[i + 1] = info.toString();
+            entryValues[i + 1] = info.locale.toString();
+        }
+
+        setEntries(entries);
+        setEntryValues(entryValues);
+    }
+
+    private static String getDisplayName(
+            Locale l, String[] specialLocaleCodes, String[] specialLocaleNames) {
+        String code = l.toString();
+
+        for (int i = 0; i < specialLocaleCodes.length; i++) {
+            if (specialLocaleCodes[i].equals(code)) {
+                return specialLocaleNames[i];
+            }
+        }
+
+        return l.getDisplayName(l);
+    }
+
+    private static class LocaleInfo implements Comparable<LocaleInfo> {
+        private static final Collator sCollator = Collator.getInstance();
+
+        public String label;
+        public Locale locale;
+
+        public LocaleInfo(String label, Locale locale) {
+            this.label = label;
+            this.locale = locale;
+        }
+
+        @Override
+        public String toString() {
+            return label;
+        }
+
+        @Override
+        public int compareTo(LocaleInfo another) {
+            return sCollator.compare(this.label, another.label);
+        }
+    }
+}
diff --git a/src/com/android/settings/accessibility/PresetPreference.java b/src/com/android/settings/accessibility/PresetPreference.java
new file mode 100644
index 00000000000..c091f712cad
--- /dev/null
+++ b/src/com/android/settings/accessibility/PresetPreference.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.accessibility.CaptioningManager;
+import android.view.accessibility.CaptioningManager.CaptionStyle;
+import android.widget.TextView;
+
+import com.android.internal.widget.SubtitleView;
+import com.android.settings.R;
+
+public class PresetPreference extends ListDialogPreference {
+    private static final float DEFAULT_FONT_SIZE = 96f;
+
+    private final CaptioningManager mCaptioningManager;
+
+    public PresetPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        setDialogLayoutResource(R.layout.grid_picker_dialog);
+        setListItemLayoutResource(R.layout.preset_picker_item);
+
+        mCaptioningManager = (CaptioningManager) context.getSystemService(
+                Context.CAPTIONING_SERVICE);
+    }
+
+    @Override
+    public boolean shouldDisableDependents() {
+        return getValue() != CaptionStyle.PRESET_CUSTOM
+                || super.shouldDisableDependents();
+    }
+
+    @Override
+    protected void onBindListItem(View view, int index) {
+        final SubtitleView previewText = (SubtitleView) view.findViewById(R.id.preview);
+        final int value = getValueAt(index);
+        ToggleCaptioningPreferenceFragment.applyCaptionProperties(
+                mCaptioningManager, previewText, value);
+
+        previewText.setTextSize(DEFAULT_FONT_SIZE);
+
+        final CharSequence title = getTitleAt(index);
+        if (title != null) {
+            final TextView summary = (TextView) view.findViewById(R.id.summary);
+            summary.setText(title);
+        }
+    }
+}
diff --git a/src/com/android/settings/accessibility/SettingsContentObserver.java b/src/com/android/settings/accessibility/SettingsContentObserver.java
new file mode 100644
index 00000000000..c3baec50382
--- /dev/null
+++ b/src/com/android/settings/accessibility/SettingsContentObserver.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.ContentResolver;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.provider.Settings;
+
+abstract class SettingsContentObserver extends ContentObserver {
+    public SettingsContentObserver(Handler handler) {
+        super(handler);
+    }
+
+    public void register(ContentResolver contentResolver) {
+        contentResolver.registerContentObserver(Settings.Secure.getUriFor(
+                Settings.Secure.ACCESSIBILITY_ENABLED), false, this);
+        contentResolver.registerContentObserver(Settings.Secure.getUriFor(
+                Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES), false, this);
+    }
+
+    public void unregister(ContentResolver contentResolver) {
+        contentResolver.unregisterContentObserver(this);
+    }
+
+    @Override
+    public abstract void onChange(boolean selfChange, Uri uri);
+}
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
new file mode 100644
index 00000000000..0c568f06301
--- /dev/null
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -0,0 +1,318 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.accessibility.AccessibilityManager;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.accessibility.ToggleSwitch.OnBeforeCheckedChangeListener;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class ToggleAccessibilityServicePreferenceFragment
+        extends ToggleFeaturePreferenceFragment implements DialogInterface.OnClickListener {
+
+    private static final int DIALOG_ID_ENABLE_WARNING = 1;
+    private static final int DIALOG_ID_DISABLE_WARNING = 2;
+
+    private final SettingsContentObserver mSettingsContentObserver =
+            new SettingsContentObserver(new Handler()) {
+            @Override
+                public void onChange(boolean selfChange, Uri uri) {
+                    String settingValue = Settings.Secure.getString(getContentResolver(),
+                            Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
+                    final boolean enabled = settingValue.contains(mComponentName.flattenToString());
+                    mToggleSwitch.setCheckedInternal(enabled);
+                }
+            };
+
+    private ComponentName mComponentName;
+
+    private int mShownDialogId;
+
+    @Override
+    public void onResume() {
+        mSettingsContentObserver.register(getContentResolver());
+        super.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        mSettingsContentObserver.unregister(getContentResolver());
+        super.onPause();
+    }
+
+    @Override
+    public void onPreferenceToggled(String preferenceKey, boolean enabled) {
+        // Parse the enabled services.
+        Set<ComponentName> enabledServices = AccessibilityUtils.getEnabledServicesFromSettings(
+                getActivity());
+
+        if (enabledServices == (Set<?>) Collections.emptySet()) {
+            enabledServices = new HashSet<ComponentName>();
+        }
+
+        // Determine enabled services and accessibility state.
+        ComponentName toggledService = ComponentName.unflattenFromString(preferenceKey);
+        boolean accessibilityEnabled = false;
+        if (enabled) {
+            enabledServices.add(toggledService);
+            // Enabling at least one service enables accessibility.
+            accessibilityEnabled = true;
+        } else {
+            enabledServices.remove(toggledService);
+            // Check how many enabled and installed services are present.
+            Set<ComponentName> installedServices = AccessibilitySettings.sInstalledServices;
+            for (ComponentName enabledService : enabledServices) {
+                if (installedServices.contains(enabledService)) {
+                    // Disabling the last service disables accessibility.
+                    accessibilityEnabled = true;
+                    break;
+                }
+            }
+        }
+
+        // Update the enabled services setting.
+        StringBuilder enabledServicesBuilder = new StringBuilder();
+        // Keep the enabled services even if they are not installed since we
+        // have no way to know whether the application restore process has
+        // completed. In general the system should be responsible for the
+        // clean up not settings.
+        for (ComponentName enabledService : enabledServices) {
+            enabledServicesBuilder.append(enabledService.flattenToString());
+            enabledServicesBuilder.append(
+                    AccessibilitySettings.ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR);
+        }
+        final int enabledServicesBuilderLength = enabledServicesBuilder.length();
+        if (enabledServicesBuilderLength > 0) {
+            enabledServicesBuilder.deleteCharAt(enabledServicesBuilderLength - 1);
+        }
+        Settings.Secure.putString(getContentResolver(),
+                Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
+                enabledServicesBuilder.toString());
+
+        // Update accessibility enabled.
+        Settings.Secure.putInt(getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_ENABLED, accessibilityEnabled ? 1 : 0);
+    }
+
+    // IMPORTANT: Refresh the info since there are dynamically changing
+    // capabilities. For
+    // example, before JellyBean MR2 the user was granting the explore by touch
+    // one.
+    private AccessibilityServiceInfo getAccessibilityServiceInfo() {
+        List<AccessibilityServiceInfo> serviceInfos = AccessibilityManager.getInstance(
+                getActivity()).getInstalledAccessibilityServiceList();
+        final int serviceInfoCount = serviceInfos.size();
+        for (int i = 0; i < serviceInfoCount; i++) {
+            AccessibilityServiceInfo serviceInfo = serviceInfos.get(i);
+            ResolveInfo resolveInfo = serviceInfo.getResolveInfo();
+            if (mComponentName.getPackageName().equals(resolveInfo.serviceInfo.packageName)
+                    && mComponentName.getClassName().equals(resolveInfo.serviceInfo.name)) {
+                return serviceInfo;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public Dialog onCreateDialog(int dialogId) {
+        switch (dialogId) {
+            case DIALOG_ID_ENABLE_WARNING: {
+            mShownDialogId = DIALOG_ID_ENABLE_WARNING;
+            AccessibilityServiceInfo info = getAccessibilityServiceInfo();
+            if (info == null) {
+                return null;
+            }
+            return new AlertDialog.Builder(getActivity())
+            .setTitle(getString(R.string.enable_service_title,
+                    info.getResolveInfo().loadLabel(getPackageManager())))
+                    .setIconAttribute(android.R.attr.alertDialogIcon)
+                    .setView(createEnableDialogContentView(info))
+                    .setCancelable(true)
+                    .setPositiveButton(android.R.string.ok, this)
+                    .setNegativeButton(android.R.string.cancel, this)
+                    .create();
+        }
+            case DIALOG_ID_DISABLE_WARNING: {
+            mShownDialogId = DIALOG_ID_DISABLE_WARNING;
+            AccessibilityServiceInfo info = getAccessibilityServiceInfo();
+            if (info == null) {
+                return null;
+            }
+            return new AlertDialog.Builder(getActivity())
+            .setTitle(getString(R.string.disable_service_title,
+                    info.getResolveInfo().loadLabel(getPackageManager())))
+                    .setIconAttribute(android.R.attr.alertDialogIcon)
+                    .setMessage(getString(R.string.disable_service_message,
+                            info.getResolveInfo().loadLabel(getPackageManager())))
+                    .setCancelable(true)
+                    .setPositiveButton(android.R.string.ok, this)
+                    .setNegativeButton(android.R.string.cancel, this)
+                    .create();
+        }
+            default: {
+            throw new IllegalArgumentException();
+        }
+        }
+    }
+
+    private View createEnableDialogContentView(AccessibilityServiceInfo info) {
+        LayoutInflater inflater = (LayoutInflater) getSystemService(
+                Context.LAYOUT_INFLATER_SERVICE);
+
+        View content = inflater.inflate(R.layout.enable_accessibility_service_dialog_content,
+                null);
+
+        TextView capabilitiesHeaderView = (TextView) content.findViewById(
+                R.id.capabilities_header);
+        capabilitiesHeaderView.setText(getString(R.string.capabilities_list_title,
+                info.getResolveInfo().loadLabel(getPackageManager())));
+
+        LinearLayout capabilitiesView = (LinearLayout) content.findViewById(R.id.capabilities);
+
+        // This capability is implicit for all services.
+        View capabilityView = inflater.inflate(
+                com.android.internal.R.layout.app_permission_item_old, null);
+
+        ImageView imageView = (ImageView) capabilityView.findViewById(
+                com.android.internal.R.id.perm_icon);
+        imageView.setImageDrawable(getResources().getDrawable(
+                com.android.internal.R.drawable.ic_text_dot));
+
+        TextView labelView = (TextView) capabilityView.findViewById(
+                com.android.internal.R.id.permission_group);
+        labelView.setText(getString(R.string.capability_title_receiveAccessibilityEvents));
+
+        TextView descriptionView = (TextView) capabilityView.findViewById(
+                com.android.internal.R.id.permission_list);
+        descriptionView.setText(getString(R.string.capability_desc_receiveAccessibilityEvents));
+
+        List<AccessibilityServiceInfo.CapabilityInfo> capabilities =
+                info.getCapabilityInfos();
+
+        capabilitiesView.addView(capabilityView);
+
+        // Service specific capabilities.
+        final int capabilityCount = capabilities.size();
+        for (int i = 0; i < capabilityCount; i++) {
+            AccessibilityServiceInfo.CapabilityInfo capability = capabilities.get(i);
+
+            capabilityView = inflater.inflate(
+                    com.android.internal.R.layout.app_permission_item_old, null);
+
+            imageView = (ImageView) capabilityView.findViewById(
+                    com.android.internal.R.id.perm_icon);
+            imageView.setImageDrawable(getResources().getDrawable(
+                    com.android.internal.R.drawable.ic_text_dot));
+
+            labelView = (TextView) capabilityView.findViewById(
+                    com.android.internal.R.id.permission_group);
+            labelView.setText(getString(capability.titleResId));
+
+            descriptionView = (TextView) capabilityView.findViewById(
+                    com.android.internal.R.id.permission_list);
+            descriptionView.setText(getString(capability.descResId));
+
+            capabilitiesView.addView(capabilityView);
+        }
+
+        return content;
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        final boolean checked;
+        switch (which) {
+            case DialogInterface.BUTTON_POSITIVE:
+                checked = (mShownDialogId == DIALOG_ID_ENABLE_WARNING);
+                mToggleSwitch.setCheckedInternal(checked);
+                getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, checked);
+                onPreferenceToggled(mPreferenceKey, checked);
+                break;
+            case DialogInterface.BUTTON_NEGATIVE:
+                checked = (mShownDialogId == DIALOG_ID_DISABLE_WARNING);
+                mToggleSwitch.setCheckedInternal(checked);
+                getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, checked);
+                onPreferenceToggled(mPreferenceKey, checked);
+                break;
+            default:
+                throw new IllegalArgumentException();
+        }
+    }
+
+    @Override
+    protected void onInstallActionBarToggleSwitch() {
+        super.onInstallActionBarToggleSwitch();
+        mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
+                @Override
+            public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
+                if (checked) {
+                    toggleSwitch.setCheckedInternal(false);
+                    getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, false);
+                    showDialog(DIALOG_ID_ENABLE_WARNING);
+                } else {
+                    toggleSwitch.setCheckedInternal(true);
+                    getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, true);
+                    showDialog(DIALOG_ID_DISABLE_WARNING);
+                }
+                return true;
+            }
+        });
+    }
+
+    @Override
+    protected void onProcessArguments(Bundle arguments) {
+        super.onProcessArguments(arguments);
+        // Settings title and intent.
+        String settingsTitle = arguments.getString(AccessibilitySettings.EXTRA_SETTINGS_TITLE);
+        String settingsComponentName = arguments.getString(
+                AccessibilitySettings.EXTRA_SETTINGS_COMPONENT_NAME);
+        if (!TextUtils.isEmpty(settingsTitle) && !TextUtils.isEmpty(settingsComponentName)) {
+            Intent settingsIntent = new Intent(Intent.ACTION_MAIN).setComponent(
+                    ComponentName.unflattenFromString(settingsComponentName.toString()));
+            if (!getPackageManager().queryIntentActivities(settingsIntent, 0).isEmpty()) {
+                mSettingsTitle = settingsTitle;
+                mSettingsIntent = settingsIntent;
+                setHasOptionsMenu(true);
+            }
+        }
+
+        mComponentName = arguments.getParcelable(AccessibilitySettings.EXTRA_COMPONENT_NAME);
+    }
+}
diff --git a/src/com/android/settings/accessibility/ToggleCaptioningPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleCaptioningPreferenceFragment.java
new file mode 100644
index 00000000000..f3c8b1ce93e
--- /dev/null
+++ b/src/com/android/settings/accessibility/ToggleCaptioningPreferenceFragment.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.os.Bundle;
+import android.preference.PreferenceFrameLayout;
+import android.provider.Settings;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.accessibility.CaptioningManager;
+
+import com.android.internal.widget.SubtitleView;
+import com.android.settings.R;
+import com.android.settings.accessibility.ToggleSwitch.OnBeforeCheckedChangeListener;
+
+import java.util.Locale;
+
+public class ToggleCaptioningPreferenceFragment extends Fragment {
+    private static final float DEFAULT_FONT_SIZE = 48f;
+
+    private CaptionPropertiesFragment mPropsFragment;
+    private SubtitleView mPreviewText;
+    private CaptioningManager mCaptioningManager;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mCaptioningManager = (CaptioningManager) getActivity()
+                .getSystemService(Context.CAPTIONING_SERVICE);
+    }
+
+    @Override
+    public View onCreateView(
+            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        final View rootView = inflater.inflate(R.layout.captioning_preview, container, false);
+
+        // We have to do this now because PreferenceFrameLayout looks at it
+        // only when the view is added.
+        if (container instanceof PreferenceFrameLayout) {
+            ((PreferenceFrameLayout.LayoutParams) rootView.getLayoutParams()).removeBorders = true;
+        }
+
+        return rootView;
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        mPropsFragment = ((CaptionPropertiesFragment) getFragmentManager()
+                .findFragmentById(R.id.properties_fragment));
+        mPropsFragment.setParent(this);
+
+        mPreviewText = (SubtitleView) view.findViewById(R.id.preview_text);
+
+        installActionBarToggleSwitch();
+        refreshPreviewText();
+    }
+
+    public void refreshPreviewText() {
+        final SubtitleView preview = mPreviewText;
+        if (preview != null) {
+            final Activity activity = getActivity();
+            final ContentResolver cr = activity.getContentResolver();
+            final int styleId = mCaptioningManager.getRawUserStyle();
+            applyCaptionProperties(mCaptioningManager, preview, styleId);
+
+            final Locale locale = mCaptioningManager.getLocale();
+            if (locale != null) {
+                final CharSequence localizedText = AccessibilityUtils.getTextForLocale(
+                        activity, locale, R.string.captioning_preview_text);
+                preview.setText(localizedText);
+            } else {
+                preview.setText(R.string.captioning_preview_text);
+            }
+        }
+    }
+
+    public static void applyCaptionProperties(
+            CaptioningManager manager, SubtitleView previewText, int styleId) {
+        previewText.setStyle(styleId);
+
+        final Context context = previewText.getContext();
+        final ContentResolver cr = context.getContentResolver();
+        final float fontScale = manager.getFontScale();
+        previewText.setTextSize(fontScale * DEFAULT_FONT_SIZE);
+
+        final Locale locale = manager.getLocale();
+        if (locale != null) {
+            final CharSequence localizedText = AccessibilityUtils.getTextForLocale(
+                    context, locale, R.string.captioning_preview_characters);
+            previewText.setText(localizedText);
+        } else {
+            previewText.setText(R.string.captioning_preview_characters);
+        }
+    }
+
+    private void installActionBarToggleSwitch() {
+        final Activity activity = getActivity();
+        final ToggleSwitch toggleSwitch = new ToggleSwitch(activity);
+
+        final int padding = getResources().getDimensionPixelSize(
+                R.dimen.action_bar_switch_padding);
+        toggleSwitch.setPaddingRelative(0, 0, padding, 0);
+
+        final ActionBar actionBar = activity.getActionBar();
+        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, ActionBar.DISPLAY_SHOW_CUSTOM);
+
+        final ActionBar.LayoutParams params = new ActionBar.LayoutParams(
+                ActionBar.LayoutParams.WRAP_CONTENT, ActionBar.LayoutParams.WRAP_CONTENT,
+                        Gravity.CENTER_VERTICAL | Gravity.END);
+        actionBar.setCustomView(toggleSwitch, params);
+
+        final boolean enabled = mCaptioningManager.isEnabled();
+        mPropsFragment.getPreferenceScreen().setEnabled(enabled);
+        mPreviewText.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
+        toggleSwitch.setCheckedInternal(enabled);
+        toggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
+            @Override
+            public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
+                toggleSwitch.setCheckedInternal(checked);
+                Settings.Secure.putInt(getActivity().getContentResolver(),
+                        Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, checked ? 1 : 0);
+                mPropsFragment.getPreferenceScreen().setEnabled(checked);
+                mPreviewText.setVisibility(checked ? View.VISIBLE : View.INVISIBLE);
+                return false;
+            }
+        });
+    }
+}
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
new file mode 100644
index 00000000000..2fbbabdb06c
--- /dev/null
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceScreen;
+import android.view.Gravity;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityManager;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+public abstract class ToggleFeaturePreferenceFragment
+        extends SettingsPreferenceFragment {
+
+    protected ToggleSwitch mToggleSwitch;
+
+    protected String mPreferenceKey;
+    protected Preference mSummaryPreference;
+
+    protected CharSequence mSettingsTitle;
+    protected Intent mSettingsIntent;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(
+                getActivity());
+        setPreferenceScreen(preferenceScreen);
+        mSummaryPreference = new Preference(getActivity()) {
+                @Override
+            protected void onBindView(View view) {
+                super.onBindView(view);
+                TextView summaryView = (TextView) view.findViewById(R.id.summary);
+                summaryView.setText(getSummary());
+                sendAccessibilityEvent(summaryView);
+            }
+
+            private void sendAccessibilityEvent(View view) {
+                // Since the view is still not attached we create, populate,
+                // and send the event directly since we do not know when it
+                // will be attached and posting commands is not as clean.
+                AccessibilityManager accessibilityManager =
+                        AccessibilityManager.getInstance(getActivity());
+                if (accessibilityManager.isEnabled()) {
+                    AccessibilityEvent event = AccessibilityEvent.obtain();
+                    event.setEventType(AccessibilityEvent.TYPE_VIEW_FOCUSED);
+                    view.onInitializeAccessibilityEvent(event);
+                    view.dispatchPopulateAccessibilityEvent(event);
+                    accessibilityManager.sendAccessibilityEvent(event);
+                }
+            }
+        };
+        mSummaryPreference.setPersistent(false);
+        mSummaryPreference.setLayoutResource(R.layout.text_description_preference);
+        preferenceScreen.addPreference(mSummaryPreference);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        onInstallActionBarToggleSwitch();
+        onProcessArguments(getArguments());
+        // Set a transparent drawable to prevent use of the default one.
+        getListView().setSelector(new ColorDrawable(Color.TRANSPARENT));
+        getListView().setDivider(null);
+    }
+
+    @Override
+    public void onDestroyView() {
+        getActivity().getActionBar().setCustomView(null);
+        mToggleSwitch.setOnBeforeCheckedChangeListener(null);
+        super.onDestroyView();
+    }
+
+    protected abstract void onPreferenceToggled(String preferenceKey, boolean enabled);
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        MenuItem menuItem = menu.add(mSettingsTitle);
+        menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        menuItem.setIntent(mSettingsIntent);
+    }
+
+    protected void onInstallActionBarToggleSwitch() {
+        mToggleSwitch = createAndAddActionBarToggleSwitch(getActivity());
+    }
+
+    private ToggleSwitch createAndAddActionBarToggleSwitch(Activity activity) {
+        ToggleSwitch toggleSwitch = new ToggleSwitch(activity);
+        final int padding = activity.getResources().getDimensionPixelSize(
+                R.dimen.action_bar_switch_padding);
+        toggleSwitch.setPaddingRelative(0, 0, padding, 0);
+        activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                ActionBar.DISPLAY_SHOW_CUSTOM);
+        activity.getActionBar().setCustomView(toggleSwitch,
+                new ActionBar.LayoutParams(ActionBar.LayoutParams.WRAP_CONTENT,
+                        ActionBar.LayoutParams.WRAP_CONTENT,
+                                Gravity.CENTER_VERTICAL | Gravity.END));
+        return toggleSwitch;
+    }
+
+    protected void onProcessArguments(Bundle arguments) {
+        // Key.
+        mPreferenceKey = arguments.getString(AccessibilitySettings.EXTRA_PREFERENCE_KEY);
+        // Enabled.
+        final boolean enabled = arguments.getBoolean(AccessibilitySettings.EXTRA_CHECKED);
+        mToggleSwitch.setCheckedInternal(enabled);
+        // Title.
+        PreferenceActivity activity = (PreferenceActivity) getActivity();
+        if (!activity.onIsMultiPane() || activity.onIsHidingHeaders()) {
+            String title = arguments.getString(AccessibilitySettings.EXTRA_TITLE);
+            getActivity().setTitle(title);
+        }
+        // Summary.
+        CharSequence summary = arguments.getCharSequence(AccessibilitySettings.EXTRA_SUMMARY);
+        mSummaryPreference.setSummary(summary);
+    }
+}
diff --git a/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
new file mode 100644
index 00000000000..f4ac2ccc29a
--- /dev/null
+++ b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.provider.Settings;
+
+import com.android.settings.accessibility.ToggleSwitch.OnBeforeCheckedChangeListener;
+
+public class ToggleGlobalGesturePreferenceFragment
+        extends ToggleFeaturePreferenceFragment {
+    @Override
+    protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
+        Settings.Global.putInt(getContentResolver(),
+                Settings.Global.ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED, enabled ? 1 : 0);
+    }
+
+    @Override
+    protected void onInstallActionBarToggleSwitch() {
+        super.onInstallActionBarToggleSwitch();
+        mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
+                @Override
+            public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
+                toggleSwitch.setCheckedInternal(checked);
+                getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, checked);
+                onPreferenceToggled(mPreferenceKey, checked);
+                return false;
+            }
+        });
+    }
+}
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
new file mode 100644
index 00000000000..27d07d2f0c1
--- /dev/null
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.provider.Settings;
+
+import com.android.settings.accessibility.ToggleSwitch.OnBeforeCheckedChangeListener;
+
+public class ToggleScreenMagnificationPreferenceFragment
+        extends ToggleFeaturePreferenceFragment {
+    @Override
+    protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
+        Settings.Secure.putInt(getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, enabled ? 1 : 0);
+    }
+
+    @Override
+    protected void onInstallActionBarToggleSwitch() {
+        super.onInstallActionBarToggleSwitch();
+        mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
+                @Override
+            public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
+                toggleSwitch.setCheckedInternal(checked);
+                getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, checked);
+                onPreferenceToggled(mPreferenceKey, checked);
+                return false;
+            }
+        });
+    }
+}
diff --git a/src/com/android/settings/accessibility/ToggleSwitch.java b/src/com/android/settings/accessibility/ToggleSwitch.java
new file mode 100644
index 00000000000..e7c39e43a95
--- /dev/null
+++ b/src/com/android/settings/accessibility/ToggleSwitch.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.Context;
+import android.widget.Switch;
+
+public class ToggleSwitch extends Switch {
+    private ToggleSwitch.OnBeforeCheckedChangeListener mOnBeforeListener;
+
+    public static interface OnBeforeCheckedChangeListener {
+        public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked);
+    }
+
+    public ToggleSwitch(Context context) {
+        super(context);
+    }
+
+    public void setOnBeforeCheckedChangeListener(OnBeforeCheckedChangeListener listener) {
+        mOnBeforeListener = listener;
+    }
+
+    @Override
+    public void setChecked(boolean checked) {
+        if (mOnBeforeListener != null
+                && mOnBeforeListener.onBeforeCheckedChanged(this, checked)) {
+            return;
+        }
+        super.setChecked(checked);
+    }
+
+    public void setCheckedInternal(boolean checked) {
+        super.setChecked(checked);
+    }
+}
diff --git a/src/com/android/settings/accounts/AuthenticatorHelper.java b/src/com/android/settings/accounts/AuthenticatorHelper.java
index eba785bad4d..a164b8be10e 100644
--- a/src/com/android/settings/accounts/AuthenticatorHelper.java
+++ b/src/com/android/settings/accounts/AuthenticatorHelper.java
@@ -23,6 +23,7 @@ import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
 import android.util.Log;
 
 import java.util.ArrayList;
@@ -45,6 +46,16 @@ public class AuthenticatorHelper {
         return mEnabledAccountTypes.toArray(new String[mEnabledAccountTypes.size()]);
     }
 
+    public void preloadDrawableForType(final Context context, final String accountType) {
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... params) {
+                getDrawableForType(context, accountType);
+                return null;
+            }
+        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[]) null);
+    }
+
     /**
      * Gets an icon associated with a particular account type. If none found, return null.
      * @param accountType the type of account
@@ -52,15 +63,19 @@ public class AuthenticatorHelper {
      */
     public Drawable getDrawableForType(Context context, final String accountType) {
         Drawable icon = null;
-        if (mAccTypeIconCache.containsKey(accountType)) {
-            return mAccTypeIconCache.get(accountType);
+        synchronized (mAccTypeIconCache) {
+            if (mAccTypeIconCache.containsKey(accountType)) {
+                return mAccTypeIconCache.get(accountType);
+            }
         }
         if (mTypeToAuthDescription.containsKey(accountType)) {
             try {
                 AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
                 Context authContext = context.createPackageContext(desc.packageName, 0);
                 icon = authContext.getResources().getDrawable(desc.iconId);
-                mAccTypeIconCache.put(accountType, icon);
+                synchronized (mAccTypeIconCache) {
+                    mAccTypeIconCache.put(accountType, icon);
+                }
             } catch (PackageManager.NameNotFoundException e) {
             } catch (Resources.NotFoundException e) {
             }
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index 8a093ca6b1f..a7f0f3057db 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -21,10 +21,7 @@ import android.accounts.AccountManager;
 import android.accounts.OnAccountsUpdateListener;
 import android.app.ActionBar;
 import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.ActivityManagerNative;
 import android.content.ContentResolver;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SyncAdapterType;
 import android.content.SyncInfo;
@@ -36,29 +33,26 @@ import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
-import android.text.format.DateFormat;
 import android.util.Log;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CompoundButton;
 import android.widget.ListView;
-import android.widget.Switch;
 import android.widget.TextView;
 
 import com.android.settings.AccountPreference;
 import com.android.settings.R;
-import com.android.settings.Settings;
 import com.android.settings.Utils;
+import com.android.settings.location.LocationSettings;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
 
+/** Manages settings for Google Account. */
 public class ManageAccountsSettings extends AccountPreferenceBase
         implements OnAccountsUpdateListener {
 
@@ -74,7 +68,6 @@ public class ManageAccountsSettings extends AccountPreferenceBase
     private String[] mAuthorities;
     private TextView mErrorInfoView;
 
-    private SettingsDialogFragment mDialogFragment;
     // If an account type is set, then show only accounts of that type
     private String mAccountType;
     // Temporary hack, to deal with backward compatibility 
@@ -354,18 +347,71 @@ public class ManageAccountsSettings extends AccountPreferenceBase
         }
     }
 
+    /** Listens to a preference click event and starts a fragment */
+    private class FragmentStarter
+            implements Preference.OnPreferenceClickListener {
+        private final String mClass;
+        private final int mTitleRes;
+
+        /**
+         * @param className the class name of the fragment to be started.
+         * @param title the title resource id of the started preference panel.
+         */
+        public FragmentStarter(String className, int title) {
+            mClass = className;
+            mTitleRes = title;
+        }
+
+        @Override
+        public boolean onPreferenceClick(Preference preference) {
+            ((PreferenceActivity) getActivity()).startPreferencePanel(
+                    mClass, null, mTitleRes, null, null, 0);
+            return true;
+        }
+    }
+
+    /**
+     * Filters through the preference list provided by GoogleLoginService.
+     *
+     * This method removes all the invalid intent from the list, adds account name as extra into the
+     * intent, and hack the location settings to start it as a fragment.
+     */
     private void updatePreferenceIntents(PreferenceScreen prefs) {
         PackageManager pm = getActivity().getPackageManager();
         for (int i = 0; i < prefs.getPreferenceCount();) {
-            Intent intent = prefs.getPreference(i).getIntent();
+            Preference pref = prefs.getPreference(i);
+            Intent intent = pref.getIntent();
             if (intent != null) {
-                ResolveInfo ri = pm.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY);
-                if (ri == null) {
-                    prefs.removePreference(prefs.getPreference(i));
-                    continue;
+                // Hack. Launch "Location" as fragment instead of as activity.
+                //
+                // When "Location" is launched as activity via Intent, there's no "Up" button at the
+                // top left, and if there's another running instance of "Location" activity, the
+                // back stack would usually point to some other place so the user won't be able to
+                // go back to the previous page by "back" key. Using fragment is a much easier
+                // solution to those problems.
+                //
+                // If we set Intent to null and assign a fragment to the PreferenceScreen item here,
+                // in order to make it work as expected, we still need to modify the container
+                // PreferenceActivity, override onPreferenceStartFragment() and call
+                // startPreferencePanel() there. In order to inject the title string there, more
+                // dirty further hack is still needed. It's much easier and cleaner to listen to
+                // preference click event here directly.
+                if (intent.getAction().equals(
+                        android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS)) {
+                    // The OnPreferenceClickListener overrides the click event completely. No intent
+                    // will get fired.
+                    pref.setOnPreferenceClickListener(new FragmentStarter(
+                            LocationSettings.class.getName(),
+                            R.string.location_settings_title));
                 } else {
-                    intent.putExtra(ACCOUNT_KEY, mFirstAccount);
-                    intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK);
+                    ResolveInfo ri = pm.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY);
+                    if (ri == null) {
+                        prefs.removePreference(pref);
+                        continue;
+                    } else {
+                        intent.putExtra(ACCOUNT_KEY, mFirstAccount);
+                        intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK);
+                    }
                 }
             }
             i++;
diff --git a/src/com/android/settings/accounts/SyncSettingsActivity.java b/src/com/android/settings/accounts/SyncSettingsActivity.java
index ed0089e936a..96f16d684a4 100644
--- a/src/com/android/settings/accounts/SyncSettingsActivity.java
+++ b/src/com/android/settings/accounts/SyncSettingsActivity.java
@@ -16,9 +16,12 @@
 
 package com.android.settings.accounts;
 
+import android.app.Fragment;
 import android.content.Intent;
 import android.preference.PreferenceActivity;
 
+import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;
+
 /**
  * Launcher activity for the SyncSettings fragment.
  *
@@ -31,4 +34,10 @@ public class SyncSettingsActivity extends PreferenceActivity {
         modIntent.putExtra(EXTRA_NO_HEADERS, true);
         return modIntent;
     }
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (SyncSettings.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java
index 39eefe21817..c3964793f2a 100644
--- a/src/com/android/settings/applications/AppOpsState.java
+++ b/src/com/android/settings/applications/AppOpsState.java
@@ -101,12 +101,16 @@ public class AppOpsState {
                     AppOpsManager.OP_FINE_LOCATION,
                     AppOpsManager.OP_GPS,
                     AppOpsManager.OP_WIFI_SCAN,
-                    AppOpsManager.OP_NEIGHBORING_CELLS },
+                    AppOpsManager.OP_NEIGHBORING_CELLS,
+                    AppOpsManager.OP_MONITOR_LOCATION,
+                    AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION},
             new boolean[] { true,
                     true,
                     false,
                     false,
-                    false }
+                    false,
+                    false,
+                    false}
             );
 
     public static final OpsTemplate PERSONAL_TEMPLATE = new OpsTemplate(
@@ -149,29 +153,53 @@ public class AppOpsState {
                     true }
             );
 
-    public static final OpsTemplate DEVICE_TEMPLATE = new OpsTemplate(
+    public static final OpsTemplate MEDIA_TEMPLATE = new OpsTemplate(
             new int[] { AppOpsManager.OP_VIBRATE,
-                    AppOpsManager.OP_POST_NOTIFICATION,
+                    AppOpsManager.OP_CAMERA,
+                    AppOpsManager.OP_RECORD_AUDIO,
+                    AppOpsManager.OP_PLAY_AUDIO,
+                    AppOpsManager.OP_TAKE_MEDIA_BUTTONS,
+                    AppOpsManager.OP_TAKE_AUDIO_FOCUS,
+                    AppOpsManager.OP_AUDIO_MASTER_VOLUME,
+                    AppOpsManager.OP_AUDIO_VOICE_VOLUME,
+                    AppOpsManager.OP_AUDIO_RING_VOLUME,
+                    AppOpsManager.OP_AUDIO_MEDIA_VOLUME,
+                    AppOpsManager.OP_AUDIO_ALARM_VOLUME,
+                    AppOpsManager.OP_AUDIO_NOTIFICATION_VOLUME,
+                    AppOpsManager.OP_AUDIO_BLUETOOTH_VOLUME, },
+            new boolean[] { false,
+                    true,
+                    true,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false,
+                    false }
+            );
+
+    public static final OpsTemplate DEVICE_TEMPLATE = new OpsTemplate(
+            new int[] { AppOpsManager.OP_POST_NOTIFICATION,
                     AppOpsManager.OP_ACCESS_NOTIFICATIONS,
                     AppOpsManager.OP_CALL_PHONE,
                     AppOpsManager.OP_WRITE_SETTINGS,
                     AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
-                    AppOpsManager.OP_CAMERA,
-                    AppOpsManager.OP_RECORD_AUDIO,
-                    AppOpsManager.OP_PLAY_AUDIO },
+                    AppOpsManager.OP_WAKE_LOCK },
             new boolean[] { false,
-                    false,
                     true,
                     true,
                     true,
                     true,
-                    true,
-                    true,
-                    true }
+                    true,  }
             );
 
     public static final OpsTemplate[] ALL_TEMPLATES = new OpsTemplate[] {
-            LOCATION_TEMPLATE, PERSONAL_TEMPLATE, MESSAGING_TEMPLATE, DEVICE_TEMPLATE
+            LOCATION_TEMPLATE, PERSONAL_TEMPLATE, MESSAGING_TEMPLATE,
+            MEDIA_TEMPLATE, DEVICE_TEMPLATE
     };
 
     /**
diff --git a/src/com/android/settings/applications/AppOpsSummary.java b/src/com/android/settings/applications/AppOpsSummary.java
index b0d9ad158b0..4cee8e583a8 100644
--- a/src/com/android/settings/applications/AppOpsSummary.java
+++ b/src/com/android/settings/applications/AppOpsSummary.java
@@ -43,6 +43,7 @@ public class AppOpsSummary extends Fragment {
         AppOpsState.LOCATION_TEMPLATE,
         AppOpsState.PERSONAL_TEMPLATE,
         AppOpsState.MESSAGING_TEMPLATE,
+        AppOpsState.MEDIA_TEMPLATE,
         AppOpsState.DEVICE_TEMPLATE
     };
 
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 3e9ba54d059..1b3938c2d74 100644
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -66,6 +66,7 @@ import android.util.Log;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -143,6 +144,8 @@ public class InstalledAppDetails extends Fragment
 
     private PackageMoveObserver mPackageMoveObserver;
 
+    private final HashSet<String> mHomePackages = new HashSet<String>();
+
     private boolean mDisableAfterUninstall;
 
     private boolean mHaveSizes = false;
@@ -242,10 +245,14 @@ public class InstalledAppDetails extends Fragment
     }
     
     private void initDataButtons() {
-        if ((mAppEntry.info.flags&(ApplicationInfo.FLAG_SYSTEM
-                | ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA))
-                == ApplicationInfo.FLAG_SYSTEM
-                || mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
+        // If the app doesn't have its own space management UI
+        // And it's a system app that doesn't allow clearing user data or is an active admin
+        // Then disable the Clear Data button.
+        if (mAppEntry.info.manageSpaceActivityName == null
+                && ((mAppEntry.info.flags&(ApplicationInfo.FLAG_SYSTEM
+                        | ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA))
+                        == ApplicationInfo.FLAG_SYSTEM
+                        || mDpm.packageHasActiveAdmins(mPackageInfo.packageName))) {
             mClearDataButton.setText(R.string.clear_user_data_text);
             mClearDataButton.setEnabled(false);
             mCanClearData = false;
@@ -316,29 +323,20 @@ public class InstalledAppDetails extends Fragment
 
     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);
+        // Try to prevent the user from bricking their phone
+        // by not allowing disabling of apps signed with the
+        // system cert and any launcher app in the system.
+        if (mHomePackages.contains(mAppEntry.info.packageName) || isThisASystemPackage()) {
+            // Disable button for core system applications.
+            button.setText(R.string.disable_text);
+        } else if (mAppEntry.info.enabled) {
+            button.setText(R.string.disable_text);
+            disableable = true;
+        } else {
+            button.setText(R.string.enable_text);
+            disableable = true;
         }
+
         return disableable;
     }
 
@@ -634,6 +632,21 @@ public class InstalledAppDetails extends Fragment
         return packageName;
     }
 
+    private boolean signaturesMatch(String pkg1, String pkg2) {
+        if (pkg1 != null && pkg2 != null) {
+            try {
+                final int match = mPm.checkSignatures(pkg1, pkg2);
+                if (match >= PackageManager.SIGNATURE_MATCH) {
+                    return true;
+                }
+            } catch (Exception e) {
+                // e.g. named alternate package not found during lookup;
+                // this is an expected case sometimes
+            }
+        }
+        return false;
+    }
+
     private boolean refreshUi() {
         if (mMoveInProgress) {
             return true;
@@ -648,6 +661,25 @@ public class InstalledAppDetails extends Fragment
             return false; // onCreate must have failed, make sure to exit
         }
 
+        // Get list of "home" apps and trace through any meta-data references
+        List<ResolveInfo> homeActivities = new ArrayList<ResolveInfo>();
+        mPm.getHomeActivities(homeActivities);
+        mHomePackages.clear();
+        for (int i = 0; i< homeActivities.size(); i++) {
+            ResolveInfo ri = homeActivities.get(i);
+            final String activityPkg = ri.activityInfo.packageName;
+            mHomePackages.add(activityPkg);
+
+            // Also make sure to include anything proxying for the home app
+            final Bundle metadata = ri.activityInfo.metaData;
+            if (metadata != null) {
+                final String metaPkg = metadata.getString(ActivityManager.META_HOME_ALTERNATE);
+                if (signaturesMatch(metaPkg, activityPkg)) {
+                    mHomePackages.add(metaPkg);
+                }
+            }
+        }
+
         // Get list of preferred activities
         List<ComponentName> prefActList = new ArrayList<ComponentName>();
         
@@ -1233,8 +1265,8 @@ public class InstalledAppDetails extends Fragment
             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);
+            getActivity().sendOrderedBroadcastAsUser(intent, UserHandle.CURRENT, null,
+                    mCheckKillProcessesReceiver, null, Activity.RESULT_CANCELED, null, null);
         }
     }
 
diff --git a/src/com/android/settings/applications/InstalledAppDetailsTop.java b/src/com/android/settings/applications/InstalledAppDetailsTop.java
index 4051aeba767..44a88fb5e4d 100644
--- a/src/com/android/settings/applications/InstalledAppDetailsTop.java
+++ b/src/com/android/settings/applications/InstalledAppDetailsTop.java
@@ -1,9 +1,13 @@
 package com.android.settings.applications;
 
+import android.app.Fragment;
 import android.content.Intent;
 import android.preference.PreferenceActivity;
 
+import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;
+
 public class InstalledAppDetailsTop extends PreferenceActivity {
+
     @Override
     public Intent getIntent() {
         Intent modIntent = new Intent(super.getIntent());
@@ -11,4 +15,11 @@ public class InstalledAppDetailsTop extends PreferenceActivity {
         modIntent.putExtra(EXTRA_NO_HEADERS, true);
         return modIntent;
     }
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (InstalledAppDetails.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
+
 }
diff --git a/src/com/android/settings/applications/LinearColorBar.java b/src/com/android/settings/applications/LinearColorBar.java
index 74fb02e3757..f374c293b32 100644
--- a/src/com/android/settings/applications/LinearColorBar.java
+++ b/src/com/android/settings/applications/LinearColorBar.java
@@ -12,30 +12,53 @@ import android.graphics.Rect;
 import android.graphics.Shader;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
+import android.view.MotionEvent;
 import android.widget.LinearLayout;
 
 public class LinearColorBar extends LinearLayout {
     static final int LEFT_COLOR = 0xff0099cc;
     static final int MIDDLE_COLOR = 0xff0099cc;
     static final int RIGHT_COLOR = 0xff888888;
+    static final int GRAY_COLOR = 0xff555555;
+    static final int WHITE_COLOR = 0xffffffff;
 
     private float mRedRatio;
     private float mYellowRatio;
     private float mGreenRatio;
 
+    private int mLeftColor = LEFT_COLOR;
+    private int mMiddleColor = MIDDLE_COLOR;
+    private int mRightColor = RIGHT_COLOR;
+
+    private boolean mShowIndicator = true;
     private boolean mShowingGreen;
 
+    private OnRegionTappedListener mOnRegionTappedListener;
+    private int mColoredRegions = REGION_RED | REGION_YELLOW | REGION_GREEN;
+
     final Rect mRect = new Rect();
     final Paint mPaint = new Paint();
 
     int mLastInterestingLeft, mLastInterestingRight;
     int mLineWidth;
 
+    int mLastLeftDiv, mLastRightDiv;
+    int mLastRegion;
+
     final Path mColorPath = new Path();
     final Path mEdgePath = new Path();
     final Paint mColorGradientPaint = new Paint();
     final Paint mEdgeGradientPaint = new Paint();
 
+    public static final int REGION_RED = 1<<0;
+    public static final int REGION_YELLOW = 1<<1;
+    public static final int REGION_GREEN = 1<<2;
+    public static final int REGION_ALL = REGION_RED | REGION_YELLOW | REGION_GREEN;
+
+    public interface OnRegionTappedListener {
+        public void onRegionTapped(int region);
+    }
+
     public LinearColorBar(Context context, AttributeSet attrs) {
         super(context, attrs);
         setWillNotDraw(false);
@@ -50,6 +73,18 @@ public class LinearColorBar extends LinearLayout {
         
     }
 
+    public void setOnRegionTappedListener(OnRegionTappedListener listener) {
+        if (listener != mOnRegionTappedListener) {
+            mOnRegionTappedListener = listener;
+            setClickable(listener != null);
+        }
+    }
+
+    public void setColoredRegions(int regions) {
+        mColoredRegions = regions;
+        invalidate();
+    }
+
     public void setRatios(float red, float yellow, float green) {
         mRedRatio = red;
         mYellowRatio = yellow;
@@ -57,6 +92,20 @@ public class LinearColorBar extends LinearLayout {
         invalidate();
     }
 
+    public void setColors(int red, int yellow, int green) {
+        mLeftColor = red;
+        mMiddleColor = yellow;
+        mRightColor = green;
+        updateIndicator();
+        invalidate();
+    }
+
+    public void setShowIndicator(boolean showIndicator) {
+        mShowIndicator = showIndicator;
+        updateIndicator();
+        invalidate();
+    }
+
     public void setShowingGreen(boolean showingGreen) {
         if (mShowingGreen != showingGreen) {
             mShowingGreen = showingGreen;
@@ -70,12 +119,15 @@ public class LinearColorBar extends LinearLayout {
         if (off < 0) off = 0;
         mRect.top = off;
         mRect.bottom = getHeight();
+        if (!mShowIndicator) {
+            return;
+        }
         if (mShowingGreen) {
             mColorGradientPaint.setShader(new LinearGradient(
-                    0, 0, 0, off-2, RIGHT_COLOR&0xffffff, RIGHT_COLOR, Shader.TileMode.CLAMP));
+                    0, 0, 0, off-2, mRightColor &0xffffff, mRightColor, Shader.TileMode.CLAMP));
         } else {
             mColorGradientPaint.setShader(new LinearGradient(
-                    0, 0, 0, off-2, MIDDLE_COLOR&0xffffff, MIDDLE_COLOR, Shader.TileMode.CLAMP));
+                    0, 0, 0, off-2, mMiddleColor&0xffffff, mMiddleColor, Shader.TileMode.CLAMP));
         }
         mEdgeGradientPaint.setShader(new LinearGradient(
                 0, 0, 0, off/2, 0x00a0a0a0, 0xffa0a0a0, Shader.TileMode.CLAMP));
@@ -87,6 +139,50 @@ public class LinearColorBar extends LinearLayout {
         updateIndicator();
     }
 
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (mOnRegionTappedListener != null) {
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN: {
+                    final int x = (int) event.getX();
+                    if (x < mLastLeftDiv) {
+                        mLastRegion = REGION_RED;
+                    } else if (x < mLastRightDiv) {
+                        mLastRegion = REGION_YELLOW;
+                    } else {
+                        mLastRegion = REGION_GREEN;
+                    }
+                    invalidate();
+                } break;
+            }
+        }
+        return super.onTouchEvent(event);
+    }
+
+    @Override
+    protected void dispatchSetPressed(boolean pressed) {
+        invalidate();
+    }
+
+    @Override
+    public boolean performClick() {
+        if (mOnRegionTappedListener != null && mLastRegion != 0) {
+            mOnRegionTappedListener.onRegionTapped(mLastRegion);
+            mLastRegion = 0;
+        }
+        return super.performClick();
+    }
+
+    private int pickColor(int color, int region) {
+        if (isPressed() && (mLastRegion&region) != 0) {
+            return WHITE_COLOR;
+        }
+        if ((mColoredRegions&region) == 0) {
+            return GRAY_COLOR;
+        }
+        return color;
+    }
+
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
@@ -111,7 +207,7 @@ public class LinearColorBar extends LinearLayout {
         if (mLastInterestingLeft != indicatorLeft || mLastInterestingRight != indicatorRight) {
             mColorPath.reset();
             mEdgePath.reset();
-            if (indicatorLeft < indicatorRight) {
+            if (mShowIndicator && indicatorLeft < indicatorRight) {
                 final int midTopY = mRect.top;
                 final int midBottomY = 0;
                 final int xoff = 2;
@@ -146,18 +242,21 @@ public class LinearColorBar extends LinearLayout {
         if (left < right) {
             mRect.left = left;
             mRect.right = right;
-            mPaint.setColor(LEFT_COLOR);
+            mPaint.setColor(pickColor(mLeftColor, REGION_RED));
             canvas.drawRect(mRect, mPaint);
             width -= (right-left);
             left = right;
         }
 
+        mLastLeftDiv = right;
+        mLastRightDiv = right2;
+
         right = right2;
 
         if (left < right) {
             mRect.left = left;
             mRect.right = right;
-            mPaint.setColor(MIDDLE_COLOR);
+            mPaint.setColor(pickColor(mMiddleColor, REGION_YELLOW));
             canvas.drawRect(mRect, mPaint);
             width -= (right-left);
             left = right;
@@ -168,7 +267,7 @@ public class LinearColorBar extends LinearLayout {
         if (left < right) {
             mRect.left = left;
             mRect.right = right;
-            mPaint.setColor(RIGHT_COLOR);
+            mPaint.setColor(pickColor(mRightColor, REGION_GREEN));
             canvas.drawRect(mRect, mPaint);
         }
     }
diff --git a/src/com/android/settings/applications/LinearColorPreference.java b/src/com/android/settings/applications/LinearColorPreference.java
new file mode 100644
index 00000000000..8d9fb724252
--- /dev/null
+++ b/src/com/android/settings/applications/LinearColorPreference.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.content.Context;
+import android.preference.Preference;
+import android.view.View;
+import com.android.settings.R;
+
+public class LinearColorPreference extends Preference {
+    float mRedRatio;
+    float mYellowRatio;
+    float mGreenRatio;
+    int mColoredRegions = LinearColorBar.REGION_ALL;
+    LinearColorBar.OnRegionTappedListener mOnRegionTappedListener;
+
+    public LinearColorPreference(Context context) {
+        super(context);
+        setLayoutResource(R.layout.preference_linearcolor);
+    }
+
+    public void setRatios(float red, float yellow, float green) {
+        mRedRatio = red;
+        mYellowRatio = yellow;
+        mGreenRatio = green;
+        notifyChanged();
+    }
+
+    public void setOnRegionTappedListener(LinearColorBar.OnRegionTappedListener listener) {
+        mOnRegionTappedListener = listener;
+        notifyChanged();
+    }
+
+    public void setColoredRegions(int regions) {
+        mColoredRegions = regions;
+        notifyChanged();
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        LinearColorBar colors = (LinearColorBar)view.findViewById(
+                R.id.linear_color_bar);
+        colors.setShowIndicator(false);
+        colors.setColors(0xffaa5030, 0xffaaaa30, 0xff30aa50);
+        colors.setRatios(mRedRatio, mYellowRatio, mGreenRatio);
+        colors.setColoredRegions(mColoredRegions);
+        colors.setOnRegionTappedListener(mOnRegionTappedListener);
+    }
+}
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index d37688c0faf..aa10c9e9d91 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -50,6 +50,7 @@ import android.provider.Settings;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.PagerTabStrip;
 import android.support.v4.view.ViewPager;
+import android.text.BidiFormatter;
 import android.text.format.Formatter;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -385,20 +386,21 @@ public class ManageApplications extends Fragment implements
                 return;
             }
             if (mTotalStorage > 0) {
+                BidiFormatter bidiFormatter = BidiFormatter.getInstance();
                 mColorBar.setRatios((mTotalStorage-mFreeStorage-mAppStorage)/(float)mTotalStorage,
                         mAppStorage/(float)mTotalStorage, mFreeStorage/(float)mTotalStorage);
                 long usedStorage = mTotalStorage - mFreeStorage;
                 if (mLastUsedStorage != usedStorage) {
                     mLastUsedStorage = usedStorage;
-                    String sizeStr = Formatter.formatShortFileSize(
-                            mOwner.getActivity(), usedStorage);
+                    String sizeStr = bidiFormatter.unicodeWrap(
+                            Formatter.formatShortFileSize(mOwner.getActivity(), usedStorage));
                     mUsedStorageText.setText(mOwner.getActivity().getResources().getString(
                             R.string.service_foreground_processes, sizeStr));
                 }
                 if (mLastFreeStorage != mFreeStorage) {
                     mLastFreeStorage = mFreeStorage;
-                    String sizeStr = Formatter.formatShortFileSize(
-                            mOwner.getActivity(), mFreeStorage);
+                    String sizeStr = bidiFormatter.unicodeWrap(
+                            Formatter.formatShortFileSize(mOwner.getActivity(), mFreeStorage));
                     mFreeStorageText.setText(mOwner.getActivity().getResources().getString(
                             R.string.service_background_processes, sizeStr));
                 }
diff --git a/src/com/android/settings/applications/ProcStatsEntry.java b/src/com/android/settings/applications/ProcStatsEntry.java
new file mode 100644
index 00000000000..0821ced2336
--- /dev/null
+++ b/src/com/android/settings/applications/ProcStatsEntry.java
@@ -0,0 +1,353 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.util.ArrayMap;
+import android.util.Log;
+import com.android.internal.app.ProcessStats;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+
+public final class ProcStatsEntry implements Parcelable {
+    private static final String TAG = "ProcStatsEntry";
+    private static boolean DEBUG = ProcessStatsUi.DEBUG;
+
+    final String mPackage;
+    final int mUid;
+    final String mName;
+    final ArrayList<String> mPackages = new ArrayList<String>();
+    final long mDuration;
+    final long mAvgPss;
+    final long mMaxPss;
+    final long mAvgUss;
+    final long mMaxUss;
+    final long mWeight;
+
+    String mBestTargetPackage;
+
+    ArrayMap<String, ArrayList<Service>> mServices = new ArrayMap<String, ArrayList<Service>>(1);
+
+    public ApplicationInfo mUiTargetApp;
+    public String mUiLabel;
+    public String mUiBaseLabel;
+    public String mUiPackage;
+
+    public ProcStatsEntry(ProcessStats.ProcessState proc, String packageName,
+            ProcessStats.ProcessDataCollection tmpTotals, boolean useUss, boolean weightWithTime) {
+        ProcessStats.computeProcessData(proc, tmpTotals, 0);
+        mPackage = proc.mPackage;
+        mUid = proc.mUid;
+        mName = proc.mName;
+        mPackages.add(packageName);
+        mDuration = tmpTotals.totalTime;
+        mAvgPss = tmpTotals.avgPss;
+        mMaxPss = tmpTotals.maxPss;
+        mAvgUss = tmpTotals.avgUss;
+        mMaxUss = tmpTotals.maxUss;
+        mWeight = (weightWithTime ? mDuration : 1) * (useUss ? mAvgUss : mAvgPss);
+        if (DEBUG) Log.d(TAG, "New proc entry " + proc.mName + ": dur=" + mDuration
+                + " avgpss=" + mAvgPss + " weight=" + mWeight);
+    }
+
+    public ProcStatsEntry(Parcel in) {
+        mPackage = in.readString();
+        mUid = in.readInt();
+        mName = in.readString();
+        in.readStringList(mPackages);
+        mDuration = in.readLong();
+        mAvgPss = in.readLong();
+        mMaxPss = in.readLong();
+        mAvgUss = in.readLong();
+        mMaxUss = in.readLong();
+        mWeight = in.readLong();
+        mBestTargetPackage = in.readString();
+        final int N = in.readInt();
+        if (N > 0) {
+            mServices.ensureCapacity(N);
+            for (int i=0; i<N; i++) {
+                String key = in.readString();
+                ArrayList<Service> value = new ArrayList<Service>();
+                in.readTypedList(value, Service.CREATOR);
+                mServices.append(key, value);
+            }
+        }
+    }
+
+    public void addPackage(String packageName) {
+        mPackages.add(packageName);
+    }
+
+    public void evaluateTargetPackage(PackageManager pm, ProcessStats stats,
+            ProcessStats.ProcessDataCollection totals, Comparator<ProcStatsEntry> compare,
+            boolean useUss, boolean weightWithTime) {
+        mBestTargetPackage = null;
+        if (mPackages.size() == 1) {
+            if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": single pkg " + mPackages.get(0));
+            mBestTargetPackage = mPackages.get(0);
+        } else {
+            // See if there is one significant package that was running here.
+            ArrayList<ProcStatsEntry> subProcs = new ArrayList<ProcStatsEntry>();
+            for (int ipkg=0; ipkg<mPackages.size(); ipkg++) {
+                ProcessStats.PackageState pkgState = stats.mPackages.get(mPackages.get(ipkg), mUid);
+                if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ", pkg "
+                        + mPackages.get(ipkg) + ":");
+                if (pkgState == null) {
+                    Log.w(TAG, "No package state found for " + mPackages.get(ipkg) + "/"
+                            + mUid + " in process " + mName);
+                    continue;
+                }
+                ProcessStats.ProcessState pkgProc = pkgState.mProcesses.get(mName);
+                if (pkgProc == null) {
+                    Log.w(TAG, "No process " + mName + " found in package state "
+                            + mPackages.get(ipkg) + "/" + mUid);
+                    continue;
+                }
+                subProcs.add(new ProcStatsEntry(pkgProc, pkgState.mPackageName, totals, useUss,
+                        weightWithTime));
+            }
+            if (subProcs.size() > 1) {
+                Collections.sort(subProcs, compare);
+                if (subProcs.get(0).mWeight > (subProcs.get(1).mWeight*3)) {
+                    if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": best pkg "
+                            + subProcs.get(0).mPackage + " weight " + subProcs.get(0).mWeight
+                            + " better than " + subProcs.get(1).mPackage
+                            + " weight " + subProcs.get(1).mWeight);
+                    mBestTargetPackage = subProcs.get(0).mPackage;
+                    return;
+                }
+                // Couldn't find one that is best by weight, let's decide on best another
+                // way: the one that has the longest running service, accounts for at least
+                // half of the maximum weight, and has specified an explicit app icon.
+                long maxWeight = subProcs.get(0).mWeight;
+                long bestRunTime = -1;
+                for (int i=0; i<subProcs.size(); i++) {
+                    if (subProcs.get(i).mWeight < (maxWeight/2)) {
+                        if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                                + subProcs.get(i).mPackage + " weight " + subProcs.get(i).mWeight
+                                + " too small");
+                        continue;
+                    }
+                    try {
+                        ApplicationInfo ai = pm.getApplicationInfo(subProcs.get(i).mPackage, 0);
+                        if (ai.icon == 0) {
+                            if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                                    + subProcs.get(i).mPackage + " has no icon");
+                            continue;
+                        }
+                    } catch (PackageManager.NameNotFoundException e) {
+                        if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                                + subProcs.get(i).mPackage + " failed finding app info");
+                        continue;
+                    }
+                    ArrayList<Service> subProcServices = null;
+                    for (int isp=0, NSP=mServices.size(); isp<NSP; isp++) {
+                        ArrayList<Service> subServices = mServices.valueAt(isp);
+                        if (subServices.get(0).mPackage.equals(subProcs.get(i).mPackage)) {
+                            subProcServices = subServices;
+                            break;
+                        }
+                    }
+                    long thisRunTime = 0;
+                    if (subProcServices != null) {
+                        for (int iss=0, NSS=subProcServices.size(); iss<NSS; iss++) {
+                            Service service = subProcServices.get(iss);
+                            if (service.mDuration > thisRunTime) {
+                                if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                                        + subProcs.get(i).mPackage + " service " + service.mName
+                                        + " run time is " + service.mDuration);
+                                thisRunTime = service.mDuration;
+                                break;
+                            }
+                        }
+                    }
+                    if (thisRunTime > bestRunTime) {
+                        if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                                + subProcs.get(i).mPackage + " new best run time " + thisRunTime);
+                        mBestTargetPackage = subProcs.get(i).mPackage;
+                        bestRunTime = thisRunTime;
+                    } else {
+                        if (DEBUG) Log.d(TAG, "Eval pkg of " + mName + ": pkg "
+                                + subProcs.get(i).mPackage + " run time " + thisRunTime
+                                + " not as good as last " + bestRunTime);
+                    }
+                }
+            } else if (subProcs.size() == 1) {
+                mBestTargetPackage = subProcs.get(0).mPackage;
+            }
+        }
+    }
+
+    public void retrieveUiData(PackageManager pm) {
+        mUiTargetApp = null;
+        mUiLabel = mUiBaseLabel = mName;
+        mUiPackage = mBestTargetPackage;
+        if (mUiPackage != null) {
+            // Only one app associated with this process.
+            try {
+                mUiTargetApp = pm.getApplicationInfo(mUiPackage,
+                        PackageManager.GET_DISABLED_COMPONENTS |
+                        PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS |
+                        PackageManager.GET_UNINSTALLED_PACKAGES);
+                String name = mUiBaseLabel = mUiTargetApp.loadLabel(pm).toString();
+                if (mName.equals(mUiPackage)) {
+                    mUiLabel = name;
+                } else {
+                    if (mName.startsWith(mUiPackage)) {
+                        int off = mUiPackage.length();
+                        if (mName.length() > off) {
+                            off++;
+                        }
+                        mUiLabel = name + " (" + mName.substring(off) + ")";
+                    } else {
+                        mUiLabel = name + " (" + mName + ")";
+                    }
+                }
+            } catch (PackageManager.NameNotFoundException e) {
+            }
+        }
+        if (mUiTargetApp == null) {
+            String[] packages = pm.getPackagesForUid(mUid);
+            if (packages != null) {
+                for (String curPkg : packages) {
+                    try {
+                        final PackageInfo pi = pm.getPackageInfo(curPkg,
+                                PackageManager.GET_DISABLED_COMPONENTS |
+                                PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS |
+                                PackageManager.GET_UNINSTALLED_PACKAGES);
+                        if (pi.sharedUserLabel != 0) {
+                            mUiTargetApp = pi.applicationInfo;
+                            final CharSequence nm = pm.getText(curPkg,
+                                    pi.sharedUserLabel, pi.applicationInfo);
+                            if (nm != null) {
+                                mUiBaseLabel = nm.toString();
+                                mUiLabel = mUiBaseLabel + " (" + mName + ")";
+                            } else {
+                                mUiBaseLabel = mUiTargetApp.loadLabel(pm).toString();
+                                mUiLabel = mUiBaseLabel + " (" + mName + ")";
+                            }
+                            break;
+                        }
+                    } catch (PackageManager.NameNotFoundException e) {
+                    }
+                }
+            } else {
+                // no current packages for this uid, typically because of uninstall
+                Log.i(TAG, "No package for uid " + mUid);
+            }
+        }
+    }
+
+    public void addService(ProcessStats.ServiceState svc) {
+        ArrayList<Service> services = mServices.get(svc.mPackage);
+        if (services == null) {
+            services = new ArrayList<Service>();
+            mServices.put(svc.mPackage, services);
+        }
+        services.add(new Service(svc));
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(mPackage);
+        dest.writeInt(mUid);
+        dest.writeString(mName);
+        dest.writeStringList(mPackages);
+        dest.writeLong(mDuration);
+        dest.writeLong(mAvgPss);
+        dest.writeLong(mMaxPss);
+        dest.writeLong(mAvgUss);
+        dest.writeLong(mMaxUss);
+        dest.writeLong(mWeight);
+        dest.writeString(mBestTargetPackage);
+        final int N = mServices.size();
+        dest.writeInt(N);
+        for (int i=0; i<N; i++) {
+            dest.writeString(mServices.keyAt(i));
+            dest.writeTypedList(mServices.valueAt(i));
+        }
+    }
+
+    public static final Parcelable.Creator<ProcStatsEntry> CREATOR
+            = new Parcelable.Creator<ProcStatsEntry>() {
+        public ProcStatsEntry createFromParcel(Parcel in) {
+            return new ProcStatsEntry(in);
+        }
+
+        public ProcStatsEntry[] newArray(int size) {
+            return new ProcStatsEntry[size];
+        }
+    };
+
+    public static final class Service implements Parcelable {
+        final String mPackage;
+        final String mName;
+        final String mProcess;
+        final long mDuration;
+
+        public Service(ProcessStats.ServiceState service) {
+            mPackage = service.mPackage;
+            mName = service.mName;
+            mProcess = service.mProcessName;
+            mDuration = ProcessStats.dumpSingleServiceTime(null, null, service,
+                    ProcessStats.ServiceState.SERVICE_RUN,
+                    ProcessStats.STATE_NOTHING, 0, 0);
+        }
+
+        public Service(Parcel in) {
+            mPackage = in.readString();
+            mName = in.readString();
+            mProcess = in.readString();
+            mDuration = in.readLong();
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeString(mPackage);
+            dest.writeString(mName);
+            dest.writeString(mProcess);
+            dest.writeLong(mDuration);
+        }
+
+        public static final Parcelable.Creator<Service> CREATOR
+                = new Parcelable.Creator<Service>() {
+            public Service createFromParcel(Parcel in) {
+                return new Service(in);
+            }
+
+            public Service[] newArray(int size) {
+                return new Service[size];
+            }
+        };
+    }
+}
diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java
new file mode 100644
index 00000000000..326ca7bb345
--- /dev/null
+++ b/src/com/android/settings/applications/ProcessStatsDetail.java
@@ -0,0 +1,317 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.Fragment;
+import android.app.admin.DevicePolicyManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Process;
+import android.os.UserHandle;
+import android.preference.PreferenceActivity;
+import android.text.format.Formatter;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import com.android.settings.R;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+
+import static com.android.settings.Utils.prepareCustomPreferencesList;
+
+public class ProcessStatsDetail extends Fragment implements Button.OnClickListener {
+    private static final String TAG = "ProcessStatsDetail";
+
+    public static final int ACTION_FORCE_STOP = 1;
+
+    public static final String EXTRA_ENTRY = "entry";
+    public static final String EXTRA_USE_USS = "use_uss";
+    public static final String EXTRA_MAX_WEIGHT = "max_weight";
+    public static final String EXTRA_TOTAL_TIME = "total_time";
+
+    private PackageManager mPm;
+    private DevicePolicyManager mDpm;
+
+    private ProcStatsEntry mEntry;
+    private boolean mUseUss;
+    private long mMaxWeight;
+    private long mTotalTime;
+
+    private View mRootView;
+    private TextView mTitleView;
+    private ViewGroup mTwoButtonsPanel;
+    private Button mForceStopButton;
+    private Button mReportButton;
+    private ViewGroup mDetailsParent;
+    private ViewGroup mServicesParent;
+
+    public static String makePercentString(Resources res, long amount, long total) {
+        final double percent = (((double)amount) / total) * 100;
+        return res.getString(R.string.percentage, (int) Math.round(percent));
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        mPm = getActivity().getPackageManager();
+        mDpm = (DevicePolicyManager)getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
+        final Bundle args = getArguments();
+        mEntry = (ProcStatsEntry)args.getParcelable(EXTRA_ENTRY);
+        mEntry.retrieveUiData(mPm);
+        mUseUss = args.getBoolean(EXTRA_USE_USS);
+        mMaxWeight = args.getLong(EXTRA_MAX_WEIGHT);
+        mTotalTime = args.getLong(EXTRA_TOTAL_TIME);
+    }
+
+    @Override
+    public View onCreateView(
+            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        final View view = inflater.inflate(R.layout.process_stats_details, container, false);
+        prepareCustomPreferencesList(container, view, view, false);
+
+        mRootView = view;
+        createDetails();
+        return view;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        checkForceStop();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+    }
+
+    private void createDetails() {
+        final double percentOfWeight = (((double)mEntry.mWeight) / mMaxWeight) * 100;
+
+        int appLevel = (int) Math.ceil(percentOfWeight);
+        String appLevelText = makePercentString(getResources(), mEntry.mDuration, mTotalTime);
+
+        // Set all values in the header.
+        final TextView summary = (TextView) mRootView.findViewById(android.R.id.summary);
+        summary.setText(mEntry.mName);
+        summary.setVisibility(View.VISIBLE);
+        mTitleView = (TextView) mRootView.findViewById(android.R.id.title);
+        mTitleView.setText(mEntry.mUiBaseLabel);
+        final TextView text1 = (TextView)mRootView.findViewById(android.R.id.text1);
+        text1.setText(appLevelText);
+        final ProgressBar progress = (ProgressBar) mRootView.findViewById(android.R.id.progress);
+        progress.setProgress(appLevel);
+        final ImageView icon = (ImageView) mRootView.findViewById(android.R.id.icon);
+        if (mEntry.mUiTargetApp != null) {
+            icon.setImageDrawable(mEntry.mUiTargetApp.loadIcon(mPm));
+        }
+
+        mTwoButtonsPanel = (ViewGroup)mRootView.findViewById(R.id.two_buttons_panel);
+        mForceStopButton = (Button)mRootView.findViewById(R.id.right_button);
+        mReportButton = (Button)mRootView.findViewById(R.id.left_button);
+        mForceStopButton.setEnabled(false);
+        mReportButton.setVisibility(View.INVISIBLE);
+
+        mDetailsParent = (ViewGroup)mRootView.findViewById(R.id.details);
+        mServicesParent = (ViewGroup)mRootView.findViewById(R.id.services);
+
+        fillDetailsSection();
+        fillServicesSection();
+
+        if (mEntry.mUid >= android.os.Process.FIRST_APPLICATION_UID) {
+            mForceStopButton.setText(R.string.force_stop);
+            mForceStopButton.setTag(ACTION_FORCE_STOP);
+            mForceStopButton.setOnClickListener(this);
+            mTwoButtonsPanel.setVisibility(View.VISIBLE);
+        } else {
+            mTwoButtonsPanel.setVisibility(View.GONE);
+        }
+    }
+
+    public void onClick(View v) {
+        doAction((Integer) v.getTag());
+    }
+
+    private void doAction(int action) {
+        PreferenceActivity pa = (PreferenceActivity)getActivity();
+        switch (action) {
+            case ACTION_FORCE_STOP:
+                killProcesses();
+                break;
+        }
+    }
+
+    private void addPackageHeaderItem(ViewGroup parent, String packageName) {
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+        ViewGroup item = (ViewGroup) inflater.inflate(R.layout.running_processes_item,
+                null);
+        parent.addView(item);
+        final ImageView icon = (ImageView) item.findViewById(R.id.icon);
+        TextView nameView = (TextView) item.findViewById(R.id.name);
+        TextView descriptionView = (TextView) item.findViewById(R.id.description);
+        try {
+            ApplicationInfo ai = mPm.getApplicationInfo(packageName, 0);
+            icon.setImageDrawable(ai.loadIcon(mPm));
+            nameView.setText(ai.loadLabel(mPm));
+        } catch (PackageManager.NameNotFoundException e) {
+        }
+        descriptionView.setText(packageName);
+    }
+
+    private void addDetailsItem(ViewGroup parent, CharSequence label, CharSequence value) {
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+        ViewGroup item = (ViewGroup) inflater.inflate(R.layout.power_usage_detail_item_text,
+                null);
+        parent.addView(item);
+        TextView labelView = (TextView) item.findViewById(R.id.label);
+        TextView valueView = (TextView) item.findViewById(R.id.value);
+        labelView.setText(label);
+        valueView.setText(value);
+    }
+
+    private void fillDetailsSection() {
+        addDetailsItem(mDetailsParent, getResources().getText(R.string.process_stats_avg_ram_use),
+                Formatter.formatShortFileSize(getActivity(),
+                        (mUseUss ? mEntry.mAvgUss : mEntry.mAvgPss) * 1024));
+        addDetailsItem(mDetailsParent, getResources().getText(R.string.process_stats_max_ram_use),
+                Formatter.formatShortFileSize(getActivity(),
+                        (mUseUss ? mEntry.mMaxUss : mEntry.mMaxPss) * 1024));
+        addDetailsItem(mDetailsParent, getResources().getText(R.string.process_stats_run_time),
+                makePercentString(getResources(), mEntry.mDuration, mTotalTime));
+    }
+
+    final static Comparator<ProcStatsEntry.Service> sServiceCompare
+            = new Comparator<ProcStatsEntry.Service>() {
+        @Override
+        public int compare(ProcStatsEntry.Service lhs, ProcStatsEntry.Service rhs) {
+            if (lhs.mDuration < rhs.mDuration) {
+                return 1;
+            } else if (lhs.mDuration > rhs.mDuration) {
+                return -1;
+            }
+            return 0;
+        }
+    };
+
+    final static Comparator<ArrayList<ProcStatsEntry.Service>> sServicePkgCompare
+            = new Comparator<ArrayList<ProcStatsEntry.Service>>() {
+        @Override
+        public int compare(ArrayList<ProcStatsEntry.Service> lhs,
+                ArrayList<ProcStatsEntry.Service> rhs) {
+            long topLhs = lhs.size() > 0 ? lhs.get(0).mDuration : 0;
+            long topRhs = rhs.size() > 0 ? rhs.get(0).mDuration : 0;
+            if (topLhs < topRhs) {
+                return 1;
+            } else if (topLhs > topRhs) {
+                return -1;
+            }
+            return 0;
+        }
+    };
+
+    private void fillServicesSection() {
+        if (mEntry.mServices.size() > 0) {
+            boolean addPackageSections = false;
+            // Sort it all.
+            ArrayList<ArrayList<ProcStatsEntry.Service>> servicePkgs
+                    = new ArrayList<ArrayList<ProcStatsEntry.Service>>();
+            for (int ip=0; ip<mEntry.mServices.size(); ip++) {
+                ArrayList<ProcStatsEntry.Service> services =
+                        (ArrayList<ProcStatsEntry.Service>)mEntry.mServices.valueAt(ip).clone();
+                Collections.sort(services, sServiceCompare);
+                servicePkgs.add(services);
+            }
+            if (mEntry.mServices.size() > 1
+                    || !mEntry.mServices.valueAt(0).get(0).mPackage.equals(mEntry.mPackage)) {
+                addPackageSections = true;
+                // Sort these so that the one(s) with the longest run durations are on top.
+                Collections.sort(servicePkgs, sServicePkgCompare);
+            }
+            for (int ip=0; ip<servicePkgs.size(); ip++) {
+                ArrayList<ProcStatsEntry.Service> services = servicePkgs.get(ip);
+                if (addPackageSections) {
+                    addPackageHeaderItem(mServicesParent, services.get(0).mPackage);
+                }
+                for (int is=0; is<services.size(); is++) {
+                    ProcStatsEntry.Service service = services.get(is);
+                    String label = service.mName;
+                    int tail = label.lastIndexOf('.');
+                    if (tail >= 0 && tail < (label.length()-1)) {
+                        label = label.substring(tail+1);
+                    }
+                    long duration = service.mDuration;
+                    final double percentOfTime = (((double)duration) / mTotalTime) * 100;
+                    addDetailsItem(mServicesParent, label, getActivity().getResources().getString(
+                            R.string.percentage, (int) Math.ceil(percentOfTime)));
+                }
+            }
+        }
+    }
+
+    private void killProcesses() {
+        ActivityManager am = (ActivityManager)getActivity().getSystemService(
+                Context.ACTIVITY_SERVICE);
+        am.forceStopPackage(mEntry.mUiPackage);
+        checkForceStop();
+    }
+
+    private final BroadcastReceiver mCheckKillProcessesReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            mForceStopButton.setEnabled(getResultCode() != Activity.RESULT_CANCELED);
+        }
+    };
+
+    private void checkForceStop() {
+        if (mEntry.mUiPackage == null || mEntry.mUid < Process.FIRST_APPLICATION_UID) {
+            mForceStopButton.setEnabled(false);
+            return;
+        }
+        if (mDpm.packageHasActiveAdmins(mEntry.mUiPackage)) {
+            mForceStopButton.setEnabled(false);
+            return;
+        }
+        try {
+            ApplicationInfo info = mPm.getApplicationInfo(mEntry.mUiPackage, 0);
+            if ((info.flags&ApplicationInfo.FLAG_STOPPED) == 0) {
+                mForceStopButton.setEnabled(true);
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+        }
+        Intent intent = new Intent(Intent.ACTION_QUERY_PACKAGE_RESTART,
+                Uri.fromParts("package", mEntry.mUiPackage, null));
+        intent.putExtra(Intent.EXTRA_PACKAGES, new String[] { mEntry.mUiPackage });
+        intent.putExtra(Intent.EXTRA_UID, mEntry.mUid);
+        intent.putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.getUserId(mEntry.mUid));
+        getActivity().sendOrderedBroadcast(intent, null, mCheckKillProcessesReceiver, null,
+                Activity.RESULT_CANCELED, null, null);
+    }
+}
diff --git a/src/com/android/settings/applications/ProcessStatsPreference.java b/src/com/android/settings/applications/ProcessStatsPreference.java
new file mode 100644
index 00000000000..bf2676d4357
--- /dev/null
+++ b/src/com/android/settings/applications/ProcessStatsPreference.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.preference.Preference;
+import android.text.format.Formatter;
+import android.view.View;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import com.android.settings.R;
+
+public class ProcessStatsPreference extends Preference {
+    private final ProcStatsEntry mEntry;
+    private int mProgress;
+    private CharSequence mProgressText;
+
+    public ProcessStatsPreference(Context context, Drawable icon, ProcStatsEntry entry) {
+        super(context);
+        mEntry = entry;
+        setLayoutResource(R.layout.app_percentage_item);
+        setIcon(icon != null ? icon : new ColorDrawable(0));
+    }
+
+    public ProcStatsEntry getEntry() {
+        return mEntry;
+    }
+
+    public void setPercent(double percentOfWeight, double percentOfTime) {
+        mProgress = (int) Math.ceil(percentOfWeight);
+        mProgressText = getContext().getResources().getString(
+                R.string.percentage, (int) Math.round(percentOfTime));
+        notifyChanged();
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        final ProgressBar progress = (ProgressBar) view.findViewById(android.R.id.progress);
+        progress.setProgress(mProgress);
+
+        final TextView text1 = (TextView) view.findViewById(android.R.id.text1);
+        text1.setText(mProgressText);
+    }
+}
diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java
new file mode 100644
index 00000000000..8322ea3526f
--- /dev/null
+++ b/src/com/android/settings/applications/ProcessStatsUi.java
@@ -0,0 +1,612 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.ParcelFileDescriptor;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemClock;
+import android.os.UserManager;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceGroup;
+import android.preference.PreferenceScreen;
+import android.util.Log;
+import android.util.SparseArray;
+import android.util.TimeUtils;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.SubMenu;
+import com.android.internal.app.IProcessStats;
+import com.android.internal.app.ProcessMap;
+import com.android.internal.app.ProcessStats;
+import com.android.settings.R;
+import com.android.settings.fuelgauge.Utils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+
+public class ProcessStatsUi extends PreferenceFragment
+        implements LinearColorBar.OnRegionTappedListener {
+    static final String TAG = "ProcessStatsUi";
+    static final boolean DEBUG = false;
+
+    private static final String KEY_APP_LIST = "app_list";
+    private static final String KEY_MEM_STATUS = "mem_status";
+
+    private static final int NUM_DURATIONS = 4;
+
+    private static final int MENU_STATS_REFRESH = Menu.FIRST;
+    private static final int MENU_DURATION = Menu.FIRST + 1;
+    private static final int MENU_SHOW_SYSTEM = MENU_DURATION + NUM_DURATIONS;
+    private static final int MENU_USE_USS = MENU_SHOW_SYSTEM + 1;
+    private static final int MENU_TYPE_BACKGROUND = MENU_USE_USS + 1;
+    private static final int MENU_TYPE_FOREGROUND = MENU_TYPE_BACKGROUND + 1;
+    private static final int MENU_TYPE_CACHED = MENU_TYPE_FOREGROUND + 1;
+    private static final int MENU_HELP = MENU_TYPE_CACHED + 1;
+
+    static final int MAX_ITEMS_TO_LIST = 60;
+
+    final static Comparator<ProcStatsEntry> sEntryCompare = new Comparator<ProcStatsEntry>() {
+        @Override
+        public int compare(ProcStatsEntry lhs, ProcStatsEntry rhs) {
+            if (lhs.mWeight < rhs.mWeight) {
+                return 1;
+            } else if (lhs.mWeight > rhs.mWeight) {
+                return -1;
+            } else if (lhs.mDuration < rhs.mDuration) {
+                return 1;
+            } else if (lhs.mDuration > rhs.mDuration) {
+                return -1;
+            }
+            return 0;
+        }
+    };
+
+    private static ProcessStats sStatsXfer;
+
+    IProcessStats mProcessStats;
+    UserManager mUm;
+    ProcessStats mStats;
+    int mMemState;
+
+    private long mDuration;
+    private long mLastDuration;
+    private boolean mShowSystem;
+    private boolean mUseUss;
+    private int mStatsType;
+    private int mMemRegion;
+
+    private MenuItem[] mDurationMenus = new MenuItem[NUM_DURATIONS];
+    private MenuItem mShowSystemMenu;
+    private MenuItem mUseUssMenu;
+    private MenuItem mTypeBackgroundMenu;
+    private MenuItem mTypeForegroundMenu;
+    private MenuItem mTypeCachedMenu;
+
+    private PreferenceGroup mAppListGroup;
+    private Preference mMemStatusPref;
+
+    long mMaxWeight;
+    long mTotalTime;
+
+    // The actual duration value to use for each duration option.  Note these
+    // are lower than the actual duration, since our durations are computed in
+    // batches of 3 hours so we want to allow the time we use to be slightly
+    // smaller than the actual time selected instead of bumping up to 3 hours
+    // beyond it.
+    private static final long DURATION_QUANTUM = ProcessStats.COMMIT_PERIOD;
+    private static long[] sDurations = new long[] {
+        3*60*60*1000 - DURATION_QUANTUM/2, 6*60*60*1000 - DURATION_QUANTUM/2,
+        12*60*60*1000 - DURATION_QUANTUM/2, 24*60*60*1000 - DURATION_QUANTUM/2
+    };
+    private static int[] sDurationLabels = new int[] {
+            R.string.menu_duration_3h, R.string.menu_duration_6h,
+            R.string.menu_duration_12h, R.string.menu_duration_1d
+    };
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        if (icicle != null) {
+            mStats = sStatsXfer;
+        }
+
+        addPreferencesFromResource(R.xml.process_stats_summary);
+        mProcessStats = IProcessStats.Stub.asInterface(
+                ServiceManager.getService(ProcessStats.SERVICE_NAME));
+        mUm = (UserManager)getActivity().getSystemService(Context.USER_SERVICE);
+        mAppListGroup = (PreferenceGroup) findPreference(KEY_APP_LIST);
+        mMemStatusPref = mAppListGroup.findPreference(KEY_MEM_STATUS);
+        mDuration = icicle != null ? icicle.getLong("duration", sDurations[0]) : sDurations[0];
+        mShowSystem = icicle != null ? icicle.getBoolean("show_system") : false;
+        mUseUss = icicle != null ? icicle.getBoolean("use_uss") : false;
+        mStatsType = icicle != null ? icicle.getInt("stats_type", MENU_TYPE_BACKGROUND)
+                : MENU_TYPE_BACKGROUND;
+        mMemRegion = icicle != null ? icicle.getInt("mem_region", LinearColorBar.REGION_GREEN)
+                : LinearColorBar.REGION_GREEN;
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        refreshStats();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putLong("duration", mDuration);
+        outState.putBoolean("show_system", mShowSystem);
+        outState.putBoolean("use_uss", mUseUss);
+        outState.putInt("stats_type", mStatsType);
+        outState.putInt("mem_region", mMemRegion);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (getActivity().isChangingConfigurations()) {
+            sStatsXfer = mStats;
+        }
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        if (!(preference instanceof ProcessStatsPreference)) {
+            return false;
+        }
+
+        ProcessStatsPreference pgp = (ProcessStatsPreference) preference;
+        Bundle args = new Bundle();
+        args.putParcelable(ProcessStatsDetail.EXTRA_ENTRY, pgp.getEntry());
+        args.putBoolean(ProcessStatsDetail.EXTRA_USE_USS, mUseUss);
+        args.putLong(ProcessStatsDetail.EXTRA_MAX_WEIGHT, mMaxWeight);
+        args.putLong(ProcessStatsDetail.EXTRA_TOTAL_TIME, mTotalTime);
+        ((PreferenceActivity) getActivity()).startPreferencePanel(
+                ProcessStatsDetail.class.getName(), args, R.string.details_title, null, null, 0);
+
+        return super.onPreferenceTreeClick(preferenceScreen, preference);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        MenuItem refresh = menu.add(0, MENU_STATS_REFRESH, 0, R.string.menu_stats_refresh)
+                .setIcon(R.drawable.ic_menu_refresh_holo_dark)
+                .setAlphabeticShortcut('r');
+        refresh.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
+                MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+        SubMenu subMenu = menu.addSubMenu(R.string.menu_proc_stats_duration);
+        for (int i=0; i<NUM_DURATIONS; i++) {
+            mDurationMenus[i] = subMenu.add(0, MENU_DURATION+i, 0, sDurationLabels[i])
+                            .setCheckable(true);
+        }
+        mShowSystemMenu = menu.add(0, MENU_SHOW_SYSTEM, 0, R.string.menu_show_system)
+                .setAlphabeticShortcut('s')
+                .setCheckable(true);
+        mUseUssMenu = menu.add(0, MENU_USE_USS, 0, R.string.menu_use_uss)
+                .setAlphabeticShortcut('u')
+                .setCheckable(true);
+        subMenu = menu.addSubMenu(R.string.menu_proc_stats_type);
+        mTypeBackgroundMenu = subMenu.add(0, MENU_TYPE_BACKGROUND, 0,
+                R.string.menu_proc_stats_type_background)
+                .setAlphabeticShortcut('b')
+                .setCheckable(true);
+        mTypeForegroundMenu = subMenu.add(0, MENU_TYPE_FOREGROUND, 0,
+                R.string.menu_proc_stats_type_foreground)
+                .setAlphabeticShortcut('f')
+                .setCheckable(true);
+        mTypeCachedMenu = subMenu.add(0, MENU_TYPE_CACHED, 0,
+                R.string.menu_proc_stats_type_cached)
+                .setCheckable(true);
+
+        updateMenus();
+
+        /*
+        String helpUrl;
+        if (!TextUtils.isEmpty(helpUrl = getResources().getString(R.string.help_url_battery))) {
+            final MenuItem help = menu.add(0, MENU_HELP, 0, R.string.help_label);
+            HelpUtils.prepareHelpMenuItem(getActivity(), help, helpUrl);
+        }
+        */
+    }
+
+    void updateMenus() {
+        int closestIndex = 0;
+        long closestDelta = Math.abs(sDurations[0]-mDuration);
+        for (int i=1; i<NUM_DURATIONS; i++) {
+            long delta = Math.abs(sDurations[i]-mDuration);
+            if (delta < closestDelta) {
+                closestDelta = delta;
+                closestIndex = i;
+            }
+        }
+        for (int i=0; i<NUM_DURATIONS; i++) {
+            if (mDurationMenus[i] != null) {
+                mDurationMenus[i].setChecked(i == closestIndex);
+            }
+        }
+        mDuration = sDurations[closestIndex];
+        if (mShowSystemMenu != null) {
+            mShowSystemMenu.setChecked(mShowSystem);
+            mShowSystemMenu.setEnabled(mStatsType == MENU_TYPE_BACKGROUND);
+        }
+        if (mUseUssMenu != null) {
+            mUseUssMenu.setChecked(mUseUss);
+        }
+        if (mTypeBackgroundMenu != null) {
+            mTypeBackgroundMenu.setChecked(mStatsType == MENU_TYPE_BACKGROUND);
+        }
+        if (mTypeForegroundMenu != null) {
+            mTypeForegroundMenu.setChecked(mStatsType == MENU_TYPE_FOREGROUND);
+        }
+        if (mTypeCachedMenu != null) {
+            mTypeCachedMenu.setChecked(mStatsType == MENU_TYPE_CACHED);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        final int id = item.getItemId();
+        switch (id) {
+            case MENU_STATS_REFRESH:
+                mStats = null;
+                refreshStats();
+                return true;
+            case MENU_SHOW_SYSTEM:
+                mShowSystem = !mShowSystem;
+                refreshStats();
+                return true;
+            case MENU_USE_USS:
+                mUseUss = !mUseUss;
+                refreshStats();
+                return true;
+            case MENU_TYPE_BACKGROUND:
+            case MENU_TYPE_FOREGROUND:
+            case MENU_TYPE_CACHED:
+                mStatsType = item.getItemId();
+                refreshStats();
+                return true;
+            default:
+                if (id >= MENU_DURATION && id < (MENU_DURATION+NUM_DURATIONS)) {
+                    mDuration = sDurations[id-MENU_DURATION];
+                    refreshStats();
+                }
+                return false;
+        }
+    }
+
+    @Override
+    public void onRegionTapped(int region) {
+        if (mMemRegion != region) {
+            mMemRegion = region;
+            refreshStats();
+        }
+    }
+
+    private void addNotAvailableMessage() {
+        Preference notAvailable = new Preference(getActivity());
+        notAvailable.setTitle(R.string.power_usage_not_available);
+        mAppListGroup.addPreference(notAvailable);
+    }
+
+    public static final int[] BACKGROUND_AND_SYSTEM_PROC_STATES = new int[] {
+            ProcessStats.STATE_PERSISTENT, ProcessStats.STATE_IMPORTANT_FOREGROUND,
+            ProcessStats.STATE_IMPORTANT_BACKGROUND, ProcessStats.STATE_BACKUP,
+            ProcessStats.STATE_HEAVY_WEIGHT, ProcessStats.STATE_SERVICE,
+            ProcessStats.STATE_SERVICE_RESTARTING, ProcessStats.STATE_RECEIVER
+    };
+
+    public static final int[] FOREGROUND_PROC_STATES = new int[] {
+            ProcessStats.STATE_TOP
+    };
+
+    public static final int[] CACHED_PROC_STATES = new int[] {
+            ProcessStats.STATE_CACHED_ACTIVITY, ProcessStats.STATE_CACHED_ACTIVITY_CLIENT,
+            ProcessStats.STATE_CACHED_EMPTY
+    };
+
+    public static final int[] RED_MEM_STATES = new int[] {
+            ProcessStats.ADJ_MEM_FACTOR_CRITICAL
+    };
+
+    public static final int[] YELLOW_MEM_STATES = new int[] {
+            ProcessStats.ADJ_MEM_FACTOR_CRITICAL, ProcessStats.ADJ_MEM_FACTOR_LOW,
+            ProcessStats.ADJ_MEM_FACTOR_MODERATE
+    };
+
+    private String makeDuration(long time) {
+        StringBuilder sb = new StringBuilder(32);
+        TimeUtils.formatDuration(time, sb);
+        return sb.toString();
+    }
+
+    private void refreshStats() {
+        updateMenus();
+
+        if (mStats == null || mLastDuration != mDuration) {
+            load();
+        }
+
+        int[] stats;
+        int statsLabel;
+        if (mStatsType == MENU_TYPE_FOREGROUND) {
+            stats = FOREGROUND_PROC_STATES;
+            statsLabel = R.string.process_stats_type_foreground;
+        } else if (mStatsType == MENU_TYPE_CACHED) {
+            stats = CACHED_PROC_STATES;
+            statsLabel = R.string.process_stats_type_cached;
+        } else {
+            stats = mShowSystem ? BACKGROUND_AND_SYSTEM_PROC_STATES
+                    : ProcessStats.BACKGROUND_PROC_STATES;
+            statsLabel = R.string.process_stats_type_background;
+        }
+
+        mAppListGroup.removeAll();
+        mAppListGroup.setOrderingAsAdded(false);
+
+        mMemStatusPref.setOrder(-2);
+        mAppListGroup.addPreference(mMemStatusPref);
+        String durationString = Utils.formatElapsedTime(getActivity(),
+                mStats.mTimePeriodEndRealtime-mStats.mTimePeriodStartRealtime, false);
+        CharSequence memString;
+        CharSequence[] memStatesStr = getResources().getTextArray(R.array.ram_states);
+        if (mMemState >= 0 && mMemState < memStatesStr.length) {
+            memString = memStatesStr[mMemState];
+        } else {
+            memString = "?";
+        }
+        mMemStatusPref.setTitle(getActivity().getString(R.string.process_stats_total_duration,
+                getActivity().getString(statsLabel), durationString));
+        mMemStatusPref.setSummary(getActivity().getString(R.string.process_stats_memory_status,
+                        memString));
+        /*
+        mMemStatusPref.setTitle(DateFormat.format(DateFormat.getBestDateTimePattern(
+                getActivity().getResources().getConfiguration().locale,
+                "MMMM dd, yyyy h:mm a"), mStats.mTimePeriodStartClock));
+        */
+        /*
+        BatteryHistoryPreference hist = new BatteryHistoryPreference(getActivity(), mStats);
+        hist.setOrder(-1);
+        mAppListGroup.addPreference(hist);
+        */
+
+        long now = SystemClock.uptimeMillis();
+
+        final PackageManager pm = getActivity().getPackageManager();
+
+        mTotalTime = ProcessStats.dumpSingleTime(null, null, mStats.mMemFactorDurations,
+                mStats.mMemFactor, mStats.mStartTime, now);
+        if (DEBUG) Log.d(TAG, "Total time of stats: " + makeDuration(mTotalTime));
+
+        long[] memTimes = new long[ProcessStats.ADJ_MEM_FACTOR_COUNT];
+        for (int iscreen=0; iscreen<ProcessStats.ADJ_COUNT; iscreen+=ProcessStats.ADJ_SCREEN_MOD) {
+            for (int imem=0; imem<ProcessStats.ADJ_MEM_FACTOR_COUNT; imem++) {
+                int state = imem+iscreen;
+                memTimes[imem] += mStats.mMemFactorDurations[state];
+            }
+        }
+
+        long memTotalTime;
+        int[] memStates;
+
+        LinearColorPreference colors = new LinearColorPreference(getActivity());
+        colors.setOrder(-1);
+        colors.setOnRegionTappedListener(this);
+        switch (mMemRegion) {
+            case LinearColorBar.REGION_RED:
+                colors.setColoredRegions(LinearColorBar.REGION_RED);
+                memTotalTime = memTimes[ProcessStats.ADJ_MEM_FACTOR_CRITICAL];
+                memStates = RED_MEM_STATES;
+                break;
+            case LinearColorBar.REGION_YELLOW:
+                colors.setColoredRegions(LinearColorBar.REGION_RED
+                        | LinearColorBar.REGION_YELLOW);
+                memTotalTime = memTimes[ProcessStats.ADJ_MEM_FACTOR_CRITICAL]
+                        + memTimes[ProcessStats.ADJ_MEM_FACTOR_LOW]
+                        + memTimes[ProcessStats.ADJ_MEM_FACTOR_MODERATE];
+                memStates = YELLOW_MEM_STATES;
+                break;
+            default:
+                colors.setColoredRegions(LinearColorBar.REGION_ALL);
+                memTotalTime = mTotalTime;
+                memStates = ProcessStats.ALL_MEM_ADJ;
+                break;
+        }
+        colors.setRatios(memTimes[ProcessStats.ADJ_MEM_FACTOR_CRITICAL] / (float)mTotalTime,
+                (memTimes[ProcessStats.ADJ_MEM_FACTOR_LOW]
+                        + memTimes[ProcessStats.ADJ_MEM_FACTOR_MODERATE]) / (float)mTotalTime,
+                memTimes[ProcessStats.ADJ_MEM_FACTOR_NORMAL] / (float)mTotalTime);
+        mAppListGroup.addPreference(colors);
+
+        ProcessStats.ProcessDataCollection totals = new ProcessStats.ProcessDataCollection(
+                ProcessStats.ALL_SCREEN_ADJ, memStates, stats);
+
+        ArrayList<ProcStatsEntry> entries = new ArrayList<ProcStatsEntry>();
+
+        /*
+        ArrayList<ProcessStats.ProcessState> rawProcs = mStats.collectProcessesLocked(
+                ProcessStats.ALL_SCREEN_ADJ, ProcessStats.ALL_MEM_ADJ,
+                ProcessStats.BACKGROUND_PROC_STATES, now, null);
+        for (int i=0, N=(rawProcs != null ? rawProcs.size() : 0); i<N; i++) {
+            procs.add(new ProcStatsEntry(rawProcs.get(i), totals));
+        }
+        */
+
+        if (DEBUG) Log.d(TAG, "-------------------- PULLING PROCESSES");
+
+        final ProcessMap<ProcStatsEntry> entriesMap = new ProcessMap<ProcStatsEntry>();
+        for (int ipkg=0, N=mStats.mPackages.getMap().size(); ipkg<N; ipkg++) {
+            final SparseArray<ProcessStats.PackageState> pkgUids
+                    = mStats.mPackages.getMap().valueAt(ipkg);
+            for (int iu=0; iu<pkgUids.size(); iu++) {
+                final ProcessStats.PackageState st = pkgUids.valueAt(iu);
+                for (int iproc=0; iproc<st.mProcesses.size(); iproc++) {
+                    final ProcessStats.ProcessState pkgProc = st.mProcesses.valueAt(iproc);
+                    final ProcessStats.ProcessState proc = mStats.mProcesses.get(pkgProc.mName,
+                            pkgProc.mUid);
+                    if (proc == null) {
+                        Log.w(TAG, "No process found for pkg " + st.mPackageName
+                                + "/" + st.mUid + " proc name " + pkgProc.mName);
+                        continue;
+                    }
+                    ProcStatsEntry ent = entriesMap.get(proc.mName, proc.mUid);
+                    if (ent == null) {
+                        ent = new ProcStatsEntry(proc, st.mPackageName, totals, mUseUss,
+                                mStatsType == MENU_TYPE_BACKGROUND);
+                        if (ent.mDuration > 0) {
+                            if (DEBUG) Log.d(TAG, "Adding proc " + proc.mName + "/"
+                                    + proc.mUid + ": time=" + makeDuration(ent.mDuration) + " ("
+                                    + ((((double)ent.mDuration) / memTotalTime) * 100) + "%)"
+                                    + " pss=" + ent.mAvgPss);
+                            entriesMap.put(proc.mName, proc.mUid, ent);
+                            entries.add(ent);
+                        }
+                    }  else {
+                        ent.addPackage(st.mPackageName);
+                    }
+                }
+            }
+        }
+
+        if (DEBUG) Log.d(TAG, "-------------------- MAPPING SERVICES");
+
+        // Add in service info.
+        if (mStatsType == MENU_TYPE_BACKGROUND) {
+            for (int ip=0, N=mStats.mPackages.getMap().size(); ip<N; ip++) {
+                SparseArray<ProcessStats.PackageState> uids = mStats.mPackages.getMap().valueAt(ip);
+                for (int iu=0; iu<uids.size(); iu++) {
+                    ProcessStats.PackageState ps = uids.valueAt(iu);
+                    for (int is=0, NS=ps.mServices.size(); is<NS; is++) {
+                        ProcessStats.ServiceState ss = ps.mServices.valueAt(is);
+                        if (ss.mProcessName != null) {
+                            ProcStatsEntry ent = entriesMap.get(ss.mProcessName, uids.keyAt(iu));
+                            if (ent != null) {
+                                if (DEBUG) Log.d(TAG, "Adding service " + ps.mPackageName
+                                        + "/" + ss.mName + "/" + uids.keyAt(iu) + " to proc "
+                                        + ss.mProcessName);
+                                ent.addService(ss);
+                            } else {
+                                Log.w(TAG, "No process " + ss.mProcessName + "/" + uids.keyAt(iu)
+                                        + " for service " + ss.mName);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        /*
+        SparseArray<ArrayMap<String, ProcStatsEntry>> processes
+                = new SparseArray<ArrayMap<String, ProcStatsEntry>>();
+        for (int ip=0, N=mStats.mProcesses.getMap().size(); ip<N; ip++) {
+            SparseArray<ProcessStats.ProcessState> uids = mStats.mProcesses.getMap().valueAt(ip);
+            for (int iu=0; iu<uids.size(); iu++) {
+                ProcessStats.ProcessState st = uids.valueAt(iu);
+                ProcStatsEntry ent = new ProcStatsEntry(st, totals, mUseUss,
+                        mStatsType == MENU_TYPE_BACKGROUND);
+                if (ent.mDuration > 0) {
+                    if (DEBUG) Log.d(TAG, "Adding proc " + st.mName + "/" + st.mUid + ": time="
+                            + makeDuration(ent.mDuration) + " ("
+                            + ((((double)ent.mDuration) / memTotalTime) * 100) + "%)");
+                    procs.add(ent);
+                    ArrayMap<String, ProcStatsEntry> uidProcs = processes.get(ent.mUid);
+                    if (uidProcs == null) {
+                        uidProcs = new ArrayMap<String, ProcStatsEntry>();
+                        processes.put(ent.mUid, uidProcs);
+                    }
+                    uidProcs.put(ent.mName, ent);
+                }
+            }
+        }
+        */
+
+        Collections.sort(entries, sEntryCompare);
+
+        long maxWeight = 1;
+        for (int i=0, N=(entries != null ? entries.size() : 0); i<N; i++) {
+            ProcStatsEntry proc = entries.get(i);
+            if (maxWeight < proc.mWeight) {
+                maxWeight = proc.mWeight;
+            }
+        }
+        mMaxWeight = maxWeight;
+
+        if (DEBUG) Log.d(TAG, "-------------------- BUILDING UI");
+
+        for (int i=0, N=(entries != null ? entries.size() : 0); i<N; i++) {
+            ProcStatsEntry proc = entries.get(i);
+            final double percentOfWeight = (((double)proc.mWeight) / maxWeight) * 100;
+            final double percentOfTime = (((double)proc.mDuration) / memTotalTime) * 100;
+            if (percentOfWeight < 1 && percentOfTime < 33) {
+                if (DEBUG) Log.d(TAG, "Skipping " + proc.mName + " weight=" + percentOfWeight
+                        + " time=" + percentOfTime);
+                continue;
+            }
+            ProcessStatsPreference pref = new ProcessStatsPreference(getActivity(), null, proc);
+            proc.evaluateTargetPackage(pm, mStats, totals, sEntryCompare, mUseUss,
+                    mStatsType == MENU_TYPE_BACKGROUND);
+            proc.retrieveUiData(pm);
+            pref.setTitle(proc.mUiLabel);
+            if (proc.mUiTargetApp != null) {
+                pref.setIcon(proc.mUiTargetApp.loadIcon(pm));
+            }
+            pref.setOrder(i);
+            pref.setPercent(percentOfWeight, percentOfTime);
+            mAppListGroup.addPreference(pref);
+            if (mAppListGroup.getPreferenceCount() > (MAX_ITEMS_TO_LIST+1)) {
+                if (DEBUG) Log.d(TAG, "Done with UI, hit item limit!");
+                break;
+            }
+        }
+    }
+
+    private void load() {
+        try {
+            mLastDuration = mDuration;
+            mMemState = mProcessStats.getCurrentMemoryState();
+            ParcelFileDescriptor pfd = mProcessStats.getStatsOverTime(mDuration);
+            mStats = new ProcessStats(false);
+            InputStream is = new ParcelFileDescriptor.AutoCloseInputStream(pfd);
+            mStats.read(is);
+            try {
+                is.close();
+            } catch (IOException e) {
+            }
+            if (mStats.mReadError != null) {
+                Log.w(TAG, "Failure reading process stats: " + mStats.mReadError);
+            }
+        } catch (RemoteException e) {
+            Log.e(TAG, "RemoteException:", e);
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/RunningProcessesView.java b/src/com/android/settings/applications/RunningProcessesView.java
index 67221aef3e2..52c48416f96 100644
--- a/src/com/android/settings/applications/RunningProcessesView.java
+++ b/src/com/android/settings/applications/RunningProcessesView.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.applications;
 
+import android.text.BidiFormatter;
 import com.android.internal.util.MemInfoReader;
 import com.android.settings.R;
 
@@ -342,11 +343,14 @@ public class RunningProcessesView extends FrameLayout
                 mLastBackgroundProcessMemory = mState.mBackgroundProcessMemory;
                 mLastAvailMemory = availMem;
                 long freeMem = mLastAvailMemory + mLastBackgroundProcessMemory;
-                String sizeStr = Formatter.formatShortFileSize(getContext(), freeMem);
+                BidiFormatter bidiFormatter = BidiFormatter.getInstance();
+                String sizeStr = bidiFormatter.unicodeWrap(
+                        Formatter.formatShortFileSize(getContext(), freeMem));
                 mBackgroundProcessText.setText(getResources().getString(
                         R.string.service_background_processes, sizeStr));
-                sizeStr = Formatter.formatShortFileSize(getContext(),
-                        mMemInfoReader.getTotalSize() - freeMem);
+                sizeStr = bidiFormatter.unicodeWrap(
+                        Formatter.formatShortFileSize(getContext(),
+                                mMemInfoReader.getTotalSize() - freeMem));
                 mForegroundProcessText.setText(getResources().getString(
                         R.string.service_foreground_processes, sizeStr));
             }
diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index d373fdd6ccc..94ab11dc64a 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -32,6 +32,7 @@ import android.content.pm.ServiceInfo;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Drawable.ConstantState;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
@@ -671,7 +672,12 @@ public class RunningState {
                 return super.loadIcon(context, state);
             }
             if (mUser.mIcon != null) {
-                return mUser.mIcon.getConstantState().newDrawable();
+                ConstantState constState = mUser.mIcon.getConstantState();
+                if (constState == null) {
+                    return mUser.mIcon;
+                } else {
+                    return constState.newDrawable();
+                }
             }
             return context.getResources().getDrawable(
                     com.android.internal.R.drawable.ic_menu_cc);
@@ -831,8 +837,8 @@ public class RunningState {
                 UserInfo info = mUm.getUserInfo(newItem.mUserId);
                 userItem.mUser.mInfo = info;
                 if (info != null) {
-                    userItem.mUser.mIcon = UserUtils.getUserIcon(mUm, info,
-                            context.getResources());
+                    userItem.mUser.mIcon = UserUtils.getUserIcon(context, mUm,
+                            info, context.getResources());
                 }
                 String name = info != null ? info.name : null;
                 if (name == null) {
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
index 16476fad309..9f071cc6624 100755
--- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
@@ -28,7 +28,6 @@ import android.util.Log;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
-import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Button;
 import android.widget.CompoundButton.OnCheckedChangeListener;
@@ -56,14 +55,15 @@ public class BluetoothPermissionActivity extends AlertActivity implements
     private String mReturnPackage = null;
     private String mReturnClass = null;
 
-    private CheckBox mRememberChoice;
-    private boolean mRememberChoiceValue = false;
-
+    private int mRequestType = 0;
     private BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_CANCEL)) {
+                int requestType = intent.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
+                                               BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS);
+                if (requestType != mRequestType) return;
                 BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
                 if (mDevice.equals(device)) dismissDialog();
             }
@@ -91,15 +91,20 @@ public class BluetoothPermissionActivity extends AlertActivity implements
         mDevice = i.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
         mReturnPackage = i.getStringExtra(BluetoothDevice.EXTRA_PACKAGE_NAME);
         mReturnClass = i.getStringExtra(BluetoothDevice.EXTRA_CLASS_NAME);
-        int requestType = i.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
+        mRequestType = i.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
                                      BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS);
 
-        if (requestType == BluetoothDevice.REQUEST_TYPE_PROFILE_CONNECTION) {
-            showConnectionDialog();
-        } else if (requestType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
-            showPhonebookDialog();
-        } else {
-            Log.e(TAG, "Error: bad request type: " + requestType);
+        if(DEBUG) Log.i(TAG, "onCreate() Request type: " + mRequestType);
+
+        if (mRequestType == BluetoothDevice.REQUEST_TYPE_PROFILE_CONNECTION) {
+            showDialog(getString(R.string.bluetooth_connection_permission_request), mRequestType);
+        } else if (mRequestType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
+            showDialog(getString(R.string.bluetooth_phonebook_request), mRequestType);
+        } else if (mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
+            showDialog(getString(R.string.bluetooth_map_request), mRequestType);
+        }
+        else {
+            Log.e(TAG, "Error: bad request type: " + mRequestType);
             finish();
             return;
         }
@@ -108,92 +113,91 @@ public class BluetoothPermissionActivity extends AlertActivity implements
         mReceiverRegistered = true;
     }
 
-    private void showConnectionDialog() {
+
+    private void showDialog(String title, int requestType)
+    {
         final AlertController.AlertParams p = mAlertParams;
         p.mIconId = android.R.drawable.ic_dialog_info;
-        p.mTitle = getString(R.string.bluetooth_connection_permission_request);
-        p.mView = createConnectionDialogView();
+        p.mTitle = title;
+        if(DEBUG) Log.i(TAG, "showDialog() Request type: " + mRequestType + " this: " + this);
+        switch(requestType)
+        {
+        case BluetoothDevice.REQUEST_TYPE_PROFILE_CONNECTION:
+            p.mView = createConnectionDialogView();
+            break;
+        case BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS:
+            p.mView = createPhonebookDialogView();
+            break;
+        case BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS:
+            p.mView = createMapDialogView();
+            break;
+        }
         p.mPositiveButtonText = getString(R.string.yes);
         p.mPositiveButtonListener = this;
         p.mNegativeButtonText = getString(R.string.no);
         p.mNegativeButtonListener = this;
         mOkButton = mAlert.getButton(DialogInterface.BUTTON_POSITIVE);
         setupAlert();
-    }
 
-    private void showPhonebookDialog() {
-        final AlertController.AlertParams p = mAlertParams;
-        p.mIconId = android.R.drawable.ic_dialog_info;
-        p.mTitle = getString(R.string.bluetooth_phonebook_request);
-        p.mView = createPhonebookDialogView();
-        p.mPositiveButtonText = getString(android.R.string.yes);
-        p.mPositiveButtonListener = this;
-        p.mNegativeButtonText = getString(android.R.string.no);
-        p.mNegativeButtonListener = this;
-        mOkButton = mAlert.getButton(DialogInterface.BUTTON_POSITIVE);
-        setupAlert();
     }
-
-    private String createConnectionDisplayText() {
+    @Override
+    public void onBackPressed() {
+        /*we need an answer so ignore back button presses during auth */
+        if(DEBUG) Log.i(TAG, "Back button pressed! ignoring");
+        return;
+    }
+    private String createRemoteName()
+    {
         String mRemoteName = mDevice != null ? mDevice.getAliasName() : null;
 
         if (mRemoteName == null) mRemoteName = getString(R.string.unknown);
-        String mMessage1 = getString(R.string.bluetooth_connection_dialog_text,
-                mRemoteName);
-        return mMessage1;
-    }
-
-    private String createPhonebookDisplayText() {
-        String mRemoteName = mDevice != null ? mDevice.getAliasName() : null;
-
-        if (mRemoteName == null) mRemoteName = getString(R.string.unknown);
-        String mMessage1 = getString(R.string.bluetooth_pb_acceptance_dialog_text,
-                                     mRemoteName, mRemoteName);
-        return mMessage1;
+        return mRemoteName;
     }
 
+    // TODO(edjee): createConnectionDialogView, createPhonebookDialogView and createMapDialogView
+    // are similar. Refactor them into one method.
+    // Also, the string resources bluetooth_remember_choice and bluetooth_pb_remember_choice should
+    // be removed.
     private View createConnectionDialogView() {
-        mView = getLayoutInflater().inflate(R.layout.bluetooth_connection_access, null);
+        String mRemoteName = createRemoteName();
+        mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null);
         messageView = (TextView)mView.findViewById(R.id.message);
-        messageView.setText(createConnectionDisplayText());
+        messageView.setText(getString(R.string.bluetooth_connection_dialog_text,
+                mRemoteName));
         return mView;
     }
 
     private View createPhonebookDialogView() {
-        mView = getLayoutInflater().inflate(R.layout.bluetooth_pb_access, null);
+        String mRemoteName = createRemoteName();
+        mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null);
         messageView = (TextView)mView.findViewById(R.id.message);
-        messageView.setText(createPhonebookDisplayText());
-        mRememberChoice = (CheckBox)mView.findViewById(R.id.bluetooth_pb_remember_choice);
-        mRememberChoice.setChecked(false);
-        mRememberChoice.setOnCheckedChangeListener(new OnCheckedChangeListener() {
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (isChecked) {
-                    mRememberChoiceValue = true;
-                } else {
-                    mRememberChoiceValue = false;
-                }
-            }
-            });
+        messageView.setText(getString(R.string.bluetooth_pb_acceptance_dialog_text,
+                mRemoteName, mRemoteName));
+        return mView;
+    }
+
+    private View createMapDialogView() {
+        String mRemoteName = createRemoteName();
+        mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null);
+        messageView = (TextView)mView.findViewById(R.id.message);
+        messageView.setText(getString(R.string.bluetooth_map_acceptance_dialog_text,
+                mRemoteName, mRemoteName));
         return mView;
     }
 
     private void onPositive() {
-        if (DEBUG) Log.d(TAG, "onPositive mRememberChoiceValue: " + mRememberChoiceValue);
-
-        if (mRememberChoiceValue) {
-            savePhonebookPermissionChoice(CachedBluetoothDevice.PHONEBOOK_ACCESS_ALLOWED);
-        }
+        if (DEBUG) Log.d(TAG, "onPositive");
+        savePermissionChoice(mRequestType, CachedBluetoothDevice.ACCESS_ALLOWED);
+        // TODO(edjee): Now that we always save the user's choice,
+        // we can get rid of BluetoothDevice#EXTRA_ALWAYS_ALLOWED.
         sendIntentToReceiver(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY, true,
-                             BluetoothDevice.EXTRA_ALWAYS_ALLOWED, mRememberChoiceValue);
+                             BluetoothDevice.EXTRA_ALWAYS_ALLOWED, true);
         finish();
     }
 
     private void onNegative() {
-        if (DEBUG) Log.d(TAG, "onNegative mRememberChoiceValue: " + mRememberChoiceValue);
-
-        if (mRememberChoiceValue) {
-            savePhonebookPermissionChoice(CachedBluetoothDevice.PHONEBOOK_ACCESS_REJECTED);
-        }
+        if (DEBUG) Log.d(TAG, "onNegative");
+        savePermissionChoice(mRequestType, CachedBluetoothDevice.ACCESS_REJECTED);
         sendIntentToReceiver(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY, false,
                              null, false // dummy value, no effect since last param is null
                              );
@@ -207,6 +211,8 @@ public class BluetoothPermissionActivity extends AlertActivity implements
         if (mReturnPackage != null && mReturnClass != null) {
             intent.setClassName(mReturnPackage, mReturnClass);
         }
+        if(DEBUG) Log.i(TAG, "sendIntentToReceiver() Request type: " + mRequestType +
+                " mReturnPackage" + mReturnPackage + " mReturnClass" + mReturnClass);
 
         intent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT,
                         allowed ? BluetoothDevice.CONNECTION_ACCESS_YES :
@@ -216,6 +222,7 @@ public class BluetoothPermissionActivity extends AlertActivity implements
             intent.putExtra(extraName, extraValue);
         }
         intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
+        intent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE, mRequestType);
         sendBroadcast(intent, android.Manifest.permission.BLUETOOTH_ADMIN);
     }
 
@@ -246,18 +253,22 @@ public class BluetoothPermissionActivity extends AlertActivity implements
         return true;
     }
 
-    private void savePhonebookPermissionChoice(int permissionChoice) {
+    private void savePermissionChoice(int permissionType, int permissionChoice) {
         LocalBluetoothManager bluetoothManager = LocalBluetoothManager.getInstance(this);
         CachedBluetoothDeviceManager cachedDeviceManager =
             bluetoothManager.getCachedDeviceManager();
         CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
-        if (cachedDevice != null ) {
-            cachedDevice.setPhonebookPermissionChoice(permissionChoice);
-        } else {
+        if (DEBUG) Log.d(TAG, "savePermissionChoice permissionType: " + permissionType);
+        if (cachedDevice == null ) {
             cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(),
                                                          bluetoothManager.getProfileManager(),
                                                          mDevice);
+        }
+        if(permissionType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS){
             cachedDevice.setPhonebookPermissionChoice(permissionChoice);
+        }else if (permissionType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS){
+            cachedDevice.setMessagePermissionChoice(permissionChoice);
         }
     }
+
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
index e2231bbac71..c3b93be9511 100644
--- a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
@@ -36,7 +36,11 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
 
     private static final String TAG = "BluetoothPermissionRequest";
     private static final boolean DEBUG = Utils.V;
-    public static final int NOTIFICATION_ID = android.R.drawable.stat_sys_data_bluetooth;
+    private static final int NOTIFICATION_ID = android.R.drawable.stat_sys_data_bluetooth;
+
+    private static final String NOTIFICATION_TAG_PBAP = "Phonebook Access" ;
+    private static final String NOTIFICATION_TAG_MAP = "Message Access";
+
 
     Context mContext;
     int mRequestType;
@@ -49,7 +53,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
         mContext = context;
         String action = intent.getAction();
 
-        if (DEBUG) Log.d(TAG, "onReceive");
+        if (DEBUG) Log.d(TAG, "onReceive" + action);
 
         if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_REQUEST)) {
             // convert broadcast intent into activity intent (same action string)
@@ -59,14 +63,8 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
             mReturnPackage = intent.getStringExtra(BluetoothDevice.EXTRA_PACKAGE_NAME);
             mReturnClass = intent.getStringExtra(BluetoothDevice.EXTRA_CLASS_NAME);
 
-            Intent connectionAccessIntent = new Intent(action);
-            connectionAccessIntent.setClass(context, BluetoothPermissionActivity.class);
-            connectionAccessIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
-                                            mRequestType);
-            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
-            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_PACKAGE_NAME, mReturnPackage);
-            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_CLASS_NAME, mReturnClass);
+            if (DEBUG) Log.d(TAG, "onReceive request type: " + mRequestType + " return "
+                    + mReturnPackage + "," + mReturnClass);
 
             // Check if user had made decisions on accepting or rejecting the phonebook access
             // request. If there is, reply the request and return, no need to start permission
@@ -75,8 +73,22 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
                 return;
             }
 
-            String deviceAddress = mDevice != null ? mDevice.getAddress() : null;
+            Intent connectionAccessIntent = new Intent(action);
+            connectionAccessIntent.setClass(context, BluetoothPermissionActivity.class);
+            // We use the FLAG_ACTIVITY_MULTIPLE_TASK since we can have multiple concurrent access requests
+            connectionAccessIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+            connectionAccessIntent.setType(Integer.toString(mRequestType)); /* This is needed to create two pending
+                                                                               intents to the same activity.
+                                                                               The value is not used in the activity. */
+            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
+                                            mRequestType);
+            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
+            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_PACKAGE_NAME, mReturnPackage);
+            connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_CLASS_NAME, mReturnClass);
 
+            String deviceAddress = mDevice != null ? mDevice.getAddress() : null;
+            String title = null;
+            String message = null;
             PowerManager powerManager =
                 (PowerManager) context.getSystemService(Context.POWER_SERVICE);
 
@@ -93,33 +105,61 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
                 deleteIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
                 deleteIntent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT,
                         BluetoothDevice.CONNECTION_ACCESS_NO);
-
-                Notification notification = new Notification(
-                    android.R.drawable.stat_sys_data_bluetooth,
-                    context.getString(R.string.bluetooth_connection_permission_request),
-                    System.currentTimeMillis());
+                deleteIntent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE, mRequestType);
                 String deviceName = mDevice != null ? mDevice.getAliasName() : null;
-                notification.setLatestEventInfo(context,
-                    context.getString(R.string.bluetooth_connection_permission_request),
-                    context.getString(R.string.bluetooth_connection_notif_message, deviceName),
-                    PendingIntent.getActivity(context, 0, connectionAccessIntent, 0));
-                notification.flags = Notification.FLAG_AUTO_CANCEL |
-                                     Notification.FLAG_ONLY_ALERT_ONCE;
-                notification.defaults = Notification.DEFAULT_SOUND;
-                notification.deleteIntent = PendingIntent.getBroadcast(context, 0, deleteIntent, 0);
+                switch (mRequestType) {
+                    case BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS:
+                        title = context.getString(R.string.bluetooth_phonebook_request);
+                        message = context.getString(R.string.bluetooth_pb_acceptance_dialog_text, deviceName, deviceName);
+                        break;
+                    case BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS:
+                        title = context.getString(R.string.bluetooth_map_request);
+                        message = context.getString(R.string.bluetooth_map_acceptance_dialog_text, deviceName, deviceName);
+                        break;
+                    default:
+                        title = context.getString(R.string.bluetooth_connection_permission_request);
+                        message = context.getString(R.string.bluetooth_connection_dialog_text, deviceName, deviceName);
+                        break;
+                }
+                Notification notification = new Notification.Builder(context)
+                                        .setContentTitle(title)
+                                        .setTicker(message)
+                                        .setContentText(message)
+                                        .setSmallIcon(android.R.drawable.stat_sys_data_bluetooth)
+                                        .setAutoCancel(true)
+                                        .setPriority(Notification.PRIORITY_MAX)
+                                        .setOnlyAlertOnce(false)
+                                        .setDefaults(Notification.DEFAULT_ALL)
+                                        .setContentIntent(PendingIntent.getActivity(context, 0, connectionAccessIntent, 0))
+                                        .setDeleteIntent(PendingIntent.getBroadcast(context, 0, deleteIntent, 0))
+                                        .build();
+
+                notification.flags |= Notification.FLAG_NO_CLEAR; /* cannot be set with the builder */
 
                 NotificationManager notificationManager =
                     (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-                notificationManager.notify(NOTIFICATION_ID, notification);
+
+                notificationManager.notify(getNotificationTag(mRequestType),NOTIFICATION_ID, notification);
             }
         } else if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_CANCEL)) {
             // Remove the notification
             NotificationManager manager = (NotificationManager) context
                 .getSystemService(Context.NOTIFICATION_SERVICE);
-            manager.cancel(NOTIFICATION_ID);
+            mRequestType = intent.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
+                                        BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS);
+            manager.cancel(getNotificationTag(mRequestType), NOTIFICATION_ID);
         }
     }
 
+    private String getNotificationTag(int requestType) {
+        if(requestType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
+            return NOTIFICATION_TAG_PBAP;
+        } else if(mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
+            return NOTIFICATION_TAG_MAP;
+        }
+        return null;
+    }
+
     /**
      * @return true user had made a choice, this method replies to the request according
      *              to user's previous decision
@@ -128,8 +168,10 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
     private boolean checkUserChoice() {
         boolean processed = false;
 
-        // we only remember PHONEBOOK permission
-        if (mRequestType != BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
+        // ignore if it is something else than phonebook/message settings it wants us to remember
+        if (mRequestType != BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS
+                && mRequestType != BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
+            if (DEBUG) Log.d(TAG, "Unknown RequestType: " + mRequestType);
             return processed;
         }
 
@@ -143,24 +185,47 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
                 bluetoothManager.getProfileManager(), mDevice);
         }
 
-        int phonebookPermission = cachedDevice.getPhonebookPermissionChoice();
+        if(mRequestType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
 
-        if (phonebookPermission == CachedBluetoothDevice.PHONEBOOK_ACCESS_UNKNOWN) {
-            return processed;
-        }
+            int phonebookPermission = cachedDevice.getPhonebookPermissionChoice();
 
-        String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY;
-        if (phonebookPermission == CachedBluetoothDevice.PHONEBOOK_ACCESS_ALLOWED) {
-            sendIntentToReceiver(intentName, true, BluetoothDevice.EXTRA_ALWAYS_ALLOWED, true);
-            processed = true;
-        } else if (phonebookPermission == CachedBluetoothDevice.PHONEBOOK_ACCESS_REJECTED) {
-            sendIntentToReceiver(intentName, false,
-                                 null, false // dummy value, no effect since previous param is null
-                                 );
-            processed = true;
-        } else {
-            Log.e(TAG, "Bad phonebookPermission: " + phonebookPermission);
+            if (phonebookPermission == CachedBluetoothDevice.ACCESS_UNKNOWN) {
+                return processed;
+            }
+
+            String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY;
+            if (phonebookPermission == CachedBluetoothDevice.ACCESS_ALLOWED) {
+                sendIntentToReceiver(intentName, true, BluetoothDevice.EXTRA_ALWAYS_ALLOWED, true);
+                processed = true;
+            } else if (phonebookPermission == CachedBluetoothDevice.ACCESS_REJECTED) {
+                sendIntentToReceiver(intentName, false,
+                                     null, false ); // dummy value, no effect since previous param is null
+                processed = true;
+            } else {
+                Log.e(TAG, "Bad phonebookPermission: " + phonebookPermission);
+            }
+
+        } else if(mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
+
+            int messagePermission = cachedDevice.getMessagePermissionChoice();
+
+            if (messagePermission == CachedBluetoothDevice.ACCESS_UNKNOWN) {
+                return processed;
+            }
+
+            String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY;
+            if (messagePermission == CachedBluetoothDevice.ACCESS_ALLOWED) {
+                sendIntentToReceiver(intentName, true, BluetoothDevice.EXTRA_ALWAYS_ALLOWED, true);
+                processed = true;
+            } else if (messagePermission == CachedBluetoothDevice.ACCESS_REJECTED) {
+                sendIntentToReceiver(intentName, false,
+                                     null, false); // dummy value, no effect since previous param is null
+                processed = true;
+            } else {
+                Log.e(TAG, "Bad messagePermission: " + messagePermission);
+            }
         }
+        if(DEBUG) Log.d(TAG,"checkUserChoice(): returning " + processed);
         return processed;
     }
 
@@ -180,6 +245,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
             intent.putExtra(extraName, extraValue);
         }
         intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
+        intent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE, mRequestType);
         mContext.sendBroadcast(intent, android.Manifest.permission.BLUETOOTH_ADMIN);
     }
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index ab657e07e3a..529ee79714f 100755
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -27,7 +27,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
@@ -74,7 +73,6 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment {
 
     private final IntentFilter mIntentFilter;
 
-    private UserManager mUserManager;
 
     // accessed from inner class (not private to avoid thunks)
     Preference mMyDevicePreference;
@@ -96,13 +94,13 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment {
     };
 
     public BluetoothSettings() {
+        super(DISALLOW_CONFIG_BLUETOOTH);
         mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);
     }
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        mUserManager = (UserManager) getSystemService(Context.USER_SERVICE);
         mActivityStarted = (savedInstanceState == null);    // don't auto start scan after rotation
 
         mEmptyView = (TextView) getView().findViewById(android.R.id.empty);
@@ -171,7 +169,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment {
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         if (mLocalAdapter == null) return;
         // If the user is not allowed to configure bluetooth, do not show the menu.
-        if (mUserManager.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)) return;
+        if (isRestrictedAndNotPinProtected()) return;
 
         boolean bluetoothIsEnabled = mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON;
         boolean isDiscovering = mLocalAdapter.isDiscovering();
@@ -219,7 +217,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment {
     }
 
     private void startScanning() {
-        if (mUserManager.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)) return;
+        if (isRestrictedAndNotPinProtected()) return;
         if (!mAvailableDevicesCategoryIsPresent) {
             getPreferenceScreen().addPreference(mAvailableDevicesCategory);
         }
@@ -266,7 +264,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment {
                 mMyDevicePreference.setEnabled(true);
                 preferenceScreen.addPreference(mMyDevicePreference);
 
-                if (! mUserManager.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)) {
+                if (!isRestrictedAndNotPinProtected()) {
                     if (mDiscoverableEnabler == null) {
                         mDiscoverableEnabler = new BluetoothDiscoverableEnabler(getActivity(),
                                 mLocalAdapter, mMyDevicePreference);
@@ -297,7 +295,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment {
                 } else {
                     mAvailableDevicesCategory.removeAll();
                 }
-                if (! mUserManager.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)) {
+                if (!isRestrictedAndNotPinProtected()) {
                     addDeviceCategory(mAvailableDevicesCategory,
                             R.string.bluetooth_preference_found_devices,
                             BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER);
@@ -366,7 +364,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment {
         public void onClick(View v) {
             // User clicked on advanced options icon for a device in the list
             if (v.getTag() instanceof CachedBluetoothDevice) {
-                if (mUserManager.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)) return;
+                if (isRestrictedAndNotPinProtected()) return;
 
                 CachedBluetoothDevice device = (CachedBluetoothDevice) v.getTag();
 
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
index 4b19b9c1172..61d793a29a0 100755
--- a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
@@ -66,17 +66,22 @@ final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
 
     private int mPhonebookPermissionChoice;
 
+    private int mMessagePermissionChoice;
+
+
     private final Collection<Callback> mCallbacks = new ArrayList<Callback>();
 
-    // Following constants indicate the user's choices of Phone book access settings
+    // Following constants indicate the user's choices of Phone book/message access settings
     // User hasn't made any choice or settings app has wiped out the memory
-    final static int PHONEBOOK_ACCESS_UNKNOWN = 0;
+    final static int ACCESS_UNKNOWN = 0;
     // User has accepted the connection and let Settings app remember the decision
-    final static int PHONEBOOK_ACCESS_ALLOWED = 1;
+    final static int ACCESS_ALLOWED = 1;
     // User has rejected the connection and let Settings app remember the decision
-    final static int PHONEBOOK_ACCESS_REJECTED = 2;
+    final static int ACCESS_REJECTED = 2;
+
 
     private final static String PHONEBOOK_PREFS_NAME = "bluetooth_phonebook_permission";
+    private final static String MESSAGE_PREFS_NAME = "bluetooth_message_permission";
 
     /**
      * When we connect to multiple profiles, we only want to display a single
@@ -125,6 +130,23 @@ final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
             return;
         }
         mProfileConnectionState.put(profile, newProfileState);
+        if (newProfileState == BluetoothProfile.STATE_DISCONNECTED) {
+            // check whether we are disconnected with this device completely
+            boolean isDisconnected = true;
+            for (LocalBluetoothProfile pf: mProfileConnectionState.keySet()) {
+                if (mProfileConnectionState.get(pf) != BluetoothProfile.STATE_DISCONNECTED) {
+                    isDisconnected = false;
+                    break;
+                }
+            }
+            // if disconnected, restore permission choice.
+            // So ACCESS_REJECTED will take effect until we are disconnected with this device.
+            if (isDisconnected) {
+                fetchPhonebookPermissionChoice();
+                fetchMessagePermissionChoice();
+            }
+        }
+
         if (newProfileState == BluetoothProfile.STATE_CONNECTED) {
             if (!mProfiles.contains(profile)) {
                 mRemovedProfiles.remove(profile);
@@ -135,6 +157,18 @@ final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
                     mLocalNapRoleConnected = true;
                 }
             }
+            if (profile instanceof MapProfile) {
+                profile.setPreferred(mDevice, true);
+                refresh();
+            }
+        } else if (profile instanceof MapProfile &&
+                newProfileState == BluetoothProfile.STATE_DISCONNECTED) {
+            if (mProfiles.contains(profile)) {
+                mRemovedProfiles.add(profile);
+                mProfiles.remove(profile);
+            }
+            profile.setPreferred(mDevice, false);
+            refresh();
         } else if (mLocalNapRoleConnected && profile instanceof PanProfile &&
                 ((PanProfile) profile).isLocalRoleNap(mDevice) &&
                 newProfileState == BluetoothProfile.STATE_DISCONNECTED) {
@@ -341,6 +375,8 @@ final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
         for (LocalBluetoothProfile profile :getProfiles()) {
             mProfileConnectionState.put(profile, BluetoothProfile.STATE_DISCONNECTED);
         }
+        fetchPhonebookPermissionChoice();
+        fetchMessagePermissionChoice();
     }
 
     // TODO: do any of these need to run async on a background thread?
@@ -349,6 +385,7 @@ final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
         fetchBtClass();
         updateProfiles();
         fetchPhonebookPermissionChoice();
+        fetchMessagePermissionChoice();
 
         mVisible = false;
         dispatchAttributesChanged();
@@ -513,7 +550,8 @@ final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
         if (bondState == BluetoothDevice.BOND_NONE) {
             mProfiles.clear();
             mConnectAfterPairing = false;  // cancel auto-connect
-            setPhonebookPermissionChoice(PHONEBOOK_ACCESS_UNKNOWN);
+            setPhonebookPermissionChoice(ACCESS_UNKNOWN);
+            setMessagePermissionChoice(ACCESS_UNKNOWN);
         }
 
         refresh();
@@ -630,22 +668,54 @@ final class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
     }
 
     void setPhonebookPermissionChoice(int permissionChoice) {
+        mPhonebookPermissionChoice = permissionChoice;
+
+        // if user reject it, don't save it to editor.
+        if (permissionChoice == ACCESS_REJECTED) return;
+
         SharedPreferences.Editor editor =
             mContext.getSharedPreferences(PHONEBOOK_PREFS_NAME, Context.MODE_PRIVATE).edit();
-        if (permissionChoice == PHONEBOOK_ACCESS_UNKNOWN) {
+        if (permissionChoice == ACCESS_UNKNOWN) {
             editor.remove(mDevice.getAddress());
         } else {
             editor.putInt(mDevice.getAddress(), permissionChoice);
         }
         editor.commit();
-        mPhonebookPermissionChoice = permissionChoice;
     }
 
     private void fetchPhonebookPermissionChoice() {
         SharedPreferences preference = mContext.getSharedPreferences(PHONEBOOK_PREFS_NAME,
                                                                      Context.MODE_PRIVATE);
         mPhonebookPermissionChoice = preference.getInt(mDevice.getAddress(),
-                                                       PHONEBOOK_ACCESS_UNKNOWN);
+                                                       ACCESS_UNKNOWN);
+    }
+
+
+    int getMessagePermissionChoice() {
+        return mMessagePermissionChoice;
+    }
+
+    void setMessagePermissionChoice(int permissionChoice) {
+        mMessagePermissionChoice = permissionChoice;
+
+        // if user reject it, don't save it to editor.
+        if (permissionChoice == ACCESS_REJECTED) return;
+
+        SharedPreferences.Editor editor =
+            mContext.getSharedPreferences(MESSAGE_PREFS_NAME, Context.MODE_PRIVATE).edit();
+        if (permissionChoice == ACCESS_UNKNOWN) {
+            editor.remove(mDevice.getAddress());
+        } else {
+            editor.putInt(mDevice.getAddress(), permissionChoice);
+        }
+        editor.commit();
+    }
+
+    private void fetchMessagePermissionChoice() {
+        SharedPreferences preference = mContext.getSharedPreferences(MESSAGE_PREFS_NAME,
+                                                                     Context.MODE_PRIVATE);
+        mMessagePermissionChoice = preference.getInt(mDevice.getAddress(),
+                                                       ACCESS_UNKNOWN);
     }
 
 }
diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
index 7fc1b65de01..e2faf7fd546 100644
--- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
@@ -26,6 +26,7 @@ import android.preference.PreferenceScreen;
 import android.util.Log;
 
 import com.android.settings.ProgressCategory;
+import com.android.settings.RestrictedSettingsFragment;
 import com.android.settings.SettingsPreferenceFragment;
 
 import java.util.Collection;
@@ -39,7 +40,7 @@ import java.util.WeakHashMap;
  * @see DevicePickerFragment
  */
 public abstract class DeviceListPreferenceFragment extends
-        SettingsPreferenceFragment implements BluetoothCallback {
+        RestrictedSettingsFragment implements BluetoothCallback {
 
     private static final String TAG = "DeviceListPreferenceFragment";
 
@@ -58,7 +59,8 @@ public abstract class DeviceListPreferenceFragment extends
     final WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference> mDevicePreferenceMap =
             new WeakHashMap<CachedBluetoothDevice, BluetoothDevicePreference>();
 
-    DeviceListPreferenceFragment() {
+    DeviceListPreferenceFragment(String restrictedKey) {
+        super(restrictedKey);
         mFilter = BluetoothDeviceFilter.ALL_FILTER;
     }
 
diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index 027ceedbe70..4b6a6b04206 100644
--- a/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -34,6 +34,10 @@ import com.android.settings.R;
  */
 public final class DevicePickerFragment extends DeviceListPreferenceFragment {
 
+    public DevicePickerFragment() {
+        super(null /* Not tied to any user restrictions. */);
+    }
+
     private boolean mNeedAuth;
     private String mLaunchPackage;
     private String mLaunchClass;
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
index 6f4a76584fc..f00b80178d4 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
@@ -20,14 +20,15 @@ import android.app.QueuedWork;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.util.Log;
 
 /**
  * LocalBluetoothPreferences provides an interface to the preferences
  * related to Bluetooth.
  */
 final class LocalBluetoothPreferences {
-//    private static final String TAG = "LocalBluetoothPreferences";
-
+    private static final String TAG = "LocalBluetoothPreferences";
+    private static final boolean DEBUG = Utils.D;
     private static final String SHARED_PREFERENCES_NAME = "bluetooth_settings";
 
     // If a device was picked from the device picker or was in discoverable mode
@@ -61,6 +62,7 @@ final class LocalBluetoothPreferences {
             String deviceAddress) {
         LocalBluetoothManager manager = LocalBluetoothManager.getInstance(context);
         if (manager == null) {
+            if(DEBUG) Log.v(TAG, "manager == null - do not show dialog.");
             return false;
         }
 
@@ -72,6 +74,7 @@ final class LocalBluetoothPreferences {
         // If in appliance mode, do not show dialog in foreground.
         if ((context.getResources().getConfiguration().uiMode &
                 Configuration.UI_MODE_TYPE_APPLIANCE) == Configuration.UI_MODE_TYPE_APPLIANCE) {
+            if (DEBUG) Log.v(TAG, "in appliance mode - do not show dialog.");
             return false;
         }
 
@@ -109,6 +112,7 @@ final class LocalBluetoothPreferences {
                 }
             }
         }
+        if (DEBUG) Log.v(TAG, "Found no reason to show the dialog - do not show dialog.");
         return false;
     }
 
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
old mode 100755
new mode 100644
index 5d254aec6b8..78d64414360
--- a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
@@ -19,6 +19,7 @@ package com.android.settings.bluetooth;
 import android.bluetooth.BluetoothA2dp;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothHeadset;
+import android.bluetooth.BluetoothMap;
 import android.bluetooth.BluetoothInputDevice;
 import android.bluetooth.BluetoothPan;
 import android.bluetooth.BluetoothPbap;
@@ -44,7 +45,7 @@ import java.util.List;
  */
 final class LocalBluetoothProfileManager {
     private static final String TAG = "LocalBluetoothProfileManager";
-
+    private static final boolean DEBUG = Utils.D;
     /** Singleton instance. */
     private static LocalBluetoothProfileManager sInstance;
 
@@ -79,6 +80,7 @@ final class LocalBluetoothProfileManager {
 
     private A2dpProfile mA2dpProfile;
     private HeadsetProfile mHeadsetProfile;
+    private MapProfile mMapProfile;
     private final HidProfile mHidProfile;
     private OppProfile mOppProfile;
     private final PanProfile mPanProfile;
@@ -119,11 +121,17 @@ final class LocalBluetoothProfileManager {
         addPanProfile(mPanProfile, PanProfile.NAME,
                 BluetoothPan.ACTION_CONNECTION_STATE_CHANGED);
 
+        if(DEBUG) Log.d(TAG, "Adding local MAP profile");
+        mMapProfile = new MapProfile(mContext, mLocalAdapter,
+                mDeviceManager, this);
+        addProfile(mMapProfile, MapProfile.NAME,
+                BluetoothMap.ACTION_CONNECTION_STATE_CHANGED);
+
        //Create PBAP server profile, but do not add it to list of profiles
        // as we do not need to monitor the profile as part of profile list
         mPbapProfile = new PbapServerProfile(context);
 
-        Log.d(TAG, "LocalBluetoothProfileManager construction complete");
+        if (DEBUG) Log.d(TAG, "LocalBluetoothProfileManager construction complete");
     }
 
     /**
@@ -137,7 +145,7 @@ final class LocalBluetoothProfileManager {
         // A2DP
         if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.AudioSource)) {
             if (mA2dpProfile == null) {
-                Log.d(TAG, "Adding local A2DP profile");
+                if(DEBUG) Log.d(TAG, "Adding local A2DP profile");
                 mA2dpProfile = new A2dpProfile(mContext, mLocalAdapter, mDeviceManager, this);
                 addProfile(mA2dpProfile, A2dpProfile.NAME,
                         BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);
@@ -150,7 +158,7 @@ final class LocalBluetoothProfileManager {
         if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Handsfree_AG) ||
             BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.HSP_AG)) {
             if (mHeadsetProfile == null) {
-                Log.d(TAG, "Adding local HEADSET profile");
+                if (DEBUG) Log.d(TAG, "Adding local HEADSET profile");
                 mHeadsetProfile = new HeadsetProfile(mContext, mLocalAdapter,
                         mDeviceManager, this);
                 addProfile(mHeadsetProfile, HeadsetProfile.NAME,
@@ -163,7 +171,7 @@ final class LocalBluetoothProfileManager {
         // OPP
         if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.ObexObjectPush)) {
             if (mOppProfile == null) {
-                Log.d(TAG, "Adding local OPP profile");
+                if(DEBUG) Log.d(TAG, "Adding local OPP profile");
                 mOppProfile = new OppProfile();
                 // Note: no event handler for OPP, only name map.
                 mProfileNameMap.put(OppProfile.NAME, mOppProfile);
@@ -301,7 +309,6 @@ final class LocalBluetoothProfileManager {
         return mPbapProfile;
     }
 
-
     /**
      * Fill in a list of LocalBluetoothProfile objects that are supported by
      * the local device and the remote device.
@@ -346,14 +353,15 @@ final class LocalBluetoothProfileManager {
             removedProfiles.remove(mOppProfile);
         }
 
-        if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Hid) &&
+        if ((BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Hid) ||
+             BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.Hogp)) &&
             mHidProfile != null) {
             profiles.add(mHidProfile);
             removedProfiles.remove(mHidProfile);
         }
 
         if(isPanNapConnected)
-            Log.d(TAG, "Valid PAN-NAP connection exists.");
+            if(DEBUG) Log.d(TAG, "Valid PAN-NAP connection exists.");
         if ((BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.NAP) &&
             mPanProfile != null) || isPanNapConnected) {
             profiles.add(mPanProfile);
diff --git a/src/com/android/settings/bluetooth/MapProfile.java b/src/com/android/settings/bluetooth/MapProfile.java
new file mode 100644
index 00000000000..fb1b18092df
--- /dev/null
+++ b/src/com/android/settings/bluetooth/MapProfile.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothClass;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothMap;
+import android.bluetooth.BluetoothProfile;
+import android.bluetooth.BluetoothUuid;
+import android.content.Context;
+import android.os.ParcelUuid;
+import android.util.Log;
+
+import com.android.settings.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * MapProfile handles Bluetooth MAP profile.
+ */
+final class MapProfile implements LocalBluetoothProfile {
+    private static final String TAG = "MapProfile";
+    private static boolean V = true;
+
+    private BluetoothMap mService;
+    private boolean mIsProfileReady;
+
+    private final LocalBluetoothAdapter mLocalAdapter;
+    private final CachedBluetoothDeviceManager mDeviceManager;
+    private final LocalBluetoothProfileManager mProfileManager;
+
+    static final ParcelUuid[] UUIDS = {
+        BluetoothUuid.MAP,
+        BluetoothUuid.MNS,
+        BluetoothUuid.MAS,
+    };
+
+    static final String NAME = "MAP";
+
+    // Order of this profile in device profiles list
+
+    // These callbacks run on the main thread.
+    private final class MapServiceListener
+            implements BluetoothProfile.ServiceListener {
+
+        public void onServiceConnected(int profile, BluetoothProfile proxy) {
+            if (V) Log.d(TAG,"Bluetooth service connected");
+            mService = (BluetoothMap) proxy;
+            // We just bound to the service, so refresh the UI for any connected MAP devices.
+            List<BluetoothDevice> deviceList = mService.getConnectedDevices();
+            while (!deviceList.isEmpty()) {
+                BluetoothDevice nextDevice = deviceList.remove(0);
+                CachedBluetoothDevice device = mDeviceManager.findDevice(nextDevice);
+                // we may add a new device here, but generally this should not happen
+                if (device == null) {
+                    Log.w(TAG, "MapProfile found new device: " + nextDevice);
+                    device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, nextDevice);
+                }
+                device.onProfileStateChanged(MapProfile.this,
+                        BluetoothProfile.STATE_CONNECTED);
+                device.refresh();
+            }
+
+            mProfileManager.callServiceConnectedListeners();
+            mIsProfileReady=true;
+        }
+
+        public void onServiceDisconnected(int profile) {
+            if (V) Log.d(TAG,"Bluetooth service disconnected");
+            mProfileManager.callServiceDisconnectedListeners();
+            mIsProfileReady=false;
+        }
+    }
+
+    public boolean isProfileReady() {
+        if(V) Log.d(TAG,"isProfileReady(): "+ mIsProfileReady);
+        return mIsProfileReady;
+    }
+
+    MapProfile(Context context, LocalBluetoothAdapter adapter,
+            CachedBluetoothDeviceManager deviceManager,
+            LocalBluetoothProfileManager profileManager) {
+        mLocalAdapter = adapter;
+        mDeviceManager = deviceManager;
+        mProfileManager = profileManager;
+        mLocalAdapter.getProfileProxy(context, new MapServiceListener(),
+                BluetoothProfile.MAP);
+    }
+
+    public boolean isConnectable() {
+        return true;
+    }
+
+    public boolean isAutoConnectable() {
+        return true;
+    }
+
+    public boolean connect(BluetoothDevice device) {
+        if(V)Log.d(TAG,"connect() - should not get called");
+        return true; // MAP never connects out
+    }
+
+    public boolean disconnect(BluetoothDevice device) {
+        if (mService == null) return false;
+        List<BluetoothDevice> deviceList = mService.getConnectedDevices();
+        if (!deviceList.isEmpty() && deviceList.get(0).equals(device)) {
+            if (mService.getPriority(device) > BluetoothProfile.PRIORITY_ON) {
+                mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
+            }
+            return mService.disconnect(device);
+        } else {
+            return false;
+        }
+    }
+
+    public int getConnectionStatus(BluetoothDevice device) {
+        if (mService == null) return BluetoothProfile.STATE_DISCONNECTED;
+        List<BluetoothDevice> deviceList = mService.getConnectedDevices();
+        if(V) Log.d(TAG,"getConnectionStatus: status is: "+ mService.getConnectionState(device));
+
+        return !deviceList.isEmpty() && deviceList.get(0).equals(device)
+                ? mService.getConnectionState(device)
+                : BluetoothProfile.STATE_DISCONNECTED;
+    }
+
+    public boolean isPreferred(BluetoothDevice device) {
+        if (mService == null) return false;
+        return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
+    }
+
+    public int getPreferred(BluetoothDevice device) {
+        if (mService == null) return BluetoothProfile.PRIORITY_OFF;
+        return mService.getPriority(device);
+    }
+
+    public void setPreferred(BluetoothDevice device, boolean preferred) {
+        if (mService == null) return;
+        if (preferred) {
+            if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
+                mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
+            }
+        } else {
+            mService.setPriority(device, BluetoothProfile.PRIORITY_OFF);
+        }
+    }
+
+    public List<BluetoothDevice> getConnectedDevices() {
+        if (mService == null) return new ArrayList<BluetoothDevice>(0);
+        return mService.getDevicesMatchingConnectionStates(
+              new int[] {BluetoothProfile.STATE_CONNECTED,
+                         BluetoothProfile.STATE_CONNECTING,
+                         BluetoothProfile.STATE_DISCONNECTING});
+    }
+
+    public String toString() {
+        return NAME;
+    }
+
+    public int getOrdinal() {
+        return BluetoothProfile.MAP;
+    }
+
+    public int getNameResource(BluetoothDevice device) {
+        return R.string.bluetooth_profile_map;
+    }
+
+    public int getSummaryResourceForDevice(BluetoothDevice device) {
+        int state = getConnectionStatus(device);
+        switch (state) {
+            case BluetoothProfile.STATE_DISCONNECTED:
+                return R.string.bluetooth_map_profile_summary_use_for;
+
+            case BluetoothProfile.STATE_CONNECTED:
+                return R.string.bluetooth_map_profile_summary_connected;
+
+            default:
+                return Utils.getConnectionStateSummary(state);
+        }
+    }
+
+    public int getDrawableResource(BluetoothClass btClass) {
+        return R.drawable.ic_bt_cellphone;
+    }
+
+    protected void finalize() {
+        if (V) Log.d(TAG, "finalize()");
+        if (mService != null) {
+            try {
+                BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.MAP,
+                                                                       mService);
+                mService = null;
+            }catch (Throwable t) {
+                Log.w(TAG, "Error cleaning up MAP proxy", t);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
index d03f6dc414e..999611d12d2 100644
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java
@@ -19,6 +19,7 @@ package com.android.settings.deviceinfo;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
+import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -223,7 +224,11 @@ public class Memory extends SettingsPreferenceFragment {
             if (intent != null) {
                 // Don't go across app boundary if monkey is running
                 if (!Utils.isMonkeyRunning()) {
-                    startActivity(intent);
+                    try {
+                        startActivity(intent);
+                    } catch (ActivityNotFoundException anfe) {
+                        Log.w(TAG, "No activity found for intent " + intent);
+                    }
                 }
                 return true;
             }
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
index 61188ec1c2c..4e5bd63f47c 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
@@ -34,6 +34,7 @@ import android.os.storage.StorageManager;
 import android.os.storage.StorageVolume;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
+import android.provider.MediaStore;
 import android.text.format.Formatter;
 
 import com.android.settings.R;
@@ -137,6 +138,8 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory {
     public void init() {
         final Context context = getContext();
 
+        removeAll();
+
         final UserInfo currentUser;
         try {
             currentUser = ActivityManagerNative.getDefault().getCurrentUser();
@@ -242,9 +245,6 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory {
 
         if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
             mItemAvailable.setTitle(R.string.memory_available_read_only);
-            if (mFormatPreference != null) {
-                removePreference(mFormatPreference);
-            }
         } else {
             mItemAvailable.setTitle(R.string.memory_available);
         }
@@ -269,9 +269,6 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory {
             removePreference(mUsageBarPreference);
             removePreference(mItemTotal);
             removePreference(mItemAvailable);
-            if (mFormatPreference != null) {
-                removePreference(mFormatPreference);
-            }
         }
 
         if (mUsbConnected && (UsbManager.USB_FUNCTION_MTP.equals(mUsbFunction) ||
@@ -374,6 +371,7 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory {
     }
 
     public void onStorageStateChanged() {
+        init();
         measure();
     }
 
@@ -440,8 +438,8 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory {
         } 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");
+            // TODO Create a Videos category, MediaStore.Video.Media.EXTERNAL_CONTENT_URI
+            intent.setData(MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
         } else if (pref == mItemMisc) {
             Context context = getContext().getApplicationContext();
             intent = new Intent(context, MiscFilesHandler.class);
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index 51457891212..55a0457470f 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -340,7 +340,7 @@ public class BatteryHistoryChart extends View {
         long uSecTime = mStats.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000,
                 BatteryStats.STATS_SINCE_CHARGED);
         mStatsPeriod = uSecTime;
-        String durationString = Utils.formatElapsedTime(getContext(), mStatsPeriod / 1000);
+        String durationString = Utils.formatElapsedTime(getContext(), mStatsPeriod / 1000, true);
         mDurationString = getContext().getString(R.string.battery_stats_on_battery,
                 durationString);
         mChargingLabel = getContext().getString(R.string.battery_stats_charging_label);
@@ -382,7 +382,7 @@ public class BatteryHistoryChart extends View {
             mHavePhoneSignal = true;
         }
         if (mHistEnd <= mHistStart) mHistEnd = mHistStart+1;
-        mTotalDurationString = Utils.formatElapsedTime(getContext(), mHistEnd - mHistStart);
+        mTotalDurationString = Utils.formatElapsedTime(getContext(), mHistEnd - mHistStart, true);
     }
 
     @Override
@@ -654,19 +654,26 @@ public class BatteryHistoryChart extends View {
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
-        
+
         final int width = getWidth();
         final int height = getHeight();
-        
+        final boolean layoutRtl = isLayoutRtl();
+        final int textStartX = layoutRtl ? width : 0;
+        mTextPaint.setTextAlign(layoutRtl ? Paint.Align.RIGHT : Paint.Align.LEFT);
+
         canvas.drawPath(mBatLevelPath, mBatteryBackgroundPaint);
         if (mLargeMode) {
-            canvas.drawText(mDurationString, 0, -mTextAscent + (mLineWidth/2),
+            int durationHalfWidth = mTotalDurationStringWidth / 2;
+            if (layoutRtl) durationHalfWidth = -durationHalfWidth;
+            canvas.drawText(mDurationString, textStartX, -mTextAscent + (mLineWidth / 2),
                     mTextPaint);
-            canvas.drawText(mTotalDurationString, (width/2) - (mTotalDurationStringWidth/2),
+            canvas.drawText(mTotalDurationString, (width / 2) - durationHalfWidth,
                     mLevelBottom - mTextAscent + mThinLineWidth, mTextPaint);
         } else {
-            canvas.drawText(mDurationString, (width/2) - (mDurationStringWidth/2),
-                    (height/2) - ((mTextDescent-mTextAscent)/2) - mTextAscent, mTextPaint);
+            int durationHalfWidth = mDurationStringWidth / 2;
+            if (layoutRtl) durationHalfWidth = -durationHalfWidth;
+            canvas.drawText(mDurationString, (width / 2) - durationHalfWidth,
+                    (height / 2) - ((mTextDescent - mTextAscent) / 2) - mTextAscent, mTextPaint);
         }
         if (!mBatGoodPath.isEmpty()) {
             canvas.drawPath(mBatGoodPath, mBatteryGoodPaint);
@@ -703,22 +710,22 @@ public class BatteryHistoryChart extends View {
 
         if (mLargeMode) {
             if (mHavePhoneSignal) {
-                canvas.drawText(mPhoneSignalLabel, 0,
+                canvas.drawText(mPhoneSignalLabel, textStartX,
                         height - mPhoneSignalOffset - mTextDescent, mTextPaint);
             }
             if (mHaveGps) {
-                canvas.drawText(mGpsOnLabel, 0,
+                canvas.drawText(mGpsOnLabel, textStartX,
                         height - mGpsOnOffset - mTextDescent, mTextPaint);
             }
             if (mHaveWifi) {
-                canvas.drawText(mWifiRunningLabel, 0,
+                canvas.drawText(mWifiRunningLabel, textStartX,
                         height - mWifiRunningOffset - mTextDescent, mTextPaint);
             }
-            canvas.drawText(mWakeLockLabel, 0,
+            canvas.drawText(mWakeLockLabel, textStartX,
                     height - mWakeLockOffset - mTextDescent, mTextPaint);
-            canvas.drawText(mChargingLabel, 0,
+            canvas.drawText(mChargingLabel, textStartX,
                     height - mChargingOffset - mTextDescent, mTextPaint);
-            canvas.drawText(mScreenOnLabel, 0,
+            canvas.drawText(mScreenOnLabel, textStartX,
                     height - mScreenOnOffset - mTextDescent, mTextPaint);
             canvas.drawLine(0, mLevelBottom+(mThinLineWidth/2), width,
                     mLevelBottom+(mThinLineWidth/2), mTextPaint);
diff --git a/src/com/android/settings/fuelgauge/BatterySipper.java b/src/com/android/settings/fuelgauge/BatterySipper.java
index 9a8e7835c01..fcc8f697044 100644
--- a/src/com/android/settings/fuelgauge/BatterySipper.java
+++ b/src/com/android/settings/fuelgauge/BatterySipper.java
@@ -30,7 +30,11 @@ import android.os.BatteryStats.Uid;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-class BatterySipper implements Comparable<BatterySipper> {
+/**
+ * Contains information about package name, icon image, power usage about an
+ * application or a system service.
+ */
+public class BatterySipper implements Comparable<BatterySipper> {
     final Context mContext;
     /* Cache cleared when PowerUsageSummary is destroyed */
     static final HashMap<String,UidToDetail> sUidCache = new HashMap<String,UidToDetail>();
@@ -49,11 +53,14 @@ class BatterySipper implements Comparable<BatterySipper> {
     long wifiRunningTime;
     long cpuFgTime;
     long wakeLockTime;
-    long tcpBytesReceived;
-    long tcpBytesSent;
+    long mobileRxBytes;
+    long mobileTxBytes;
+    long wifiRxBytes;
+    long wifiTxBytes;
     double percent;
     double noCoveragePercent;
     String defaultPackageName;
+    String[] mPackages;
 
     static class UidToDetail {
         String name;
@@ -88,15 +95,38 @@ class BatterySipper implements Comparable<BatterySipper> {
         return values;
     }
 
-    Drawable getIcon() {
+    public Drawable getIcon() {
         return icon;
     }
 
+    /**
+     * Gets the application name
+     */
+    public String getLabel() {
+        return name;
+    }
+
+    @Override
     public int compareTo(BatterySipper other) {
         // Return the flipped value because we want the items in descending order
         return Double.compare(other.getSortValue(), getSortValue());
     }
 
+    /**
+     * Gets a list of packages associated with the current user
+     */
+    public String[] getPackages() {
+        return mPackages;
+    }
+
+    public int getUid() {
+        // Bail out if the current sipper is not an App sipper.
+        if (uidObj == null) {
+            return 0;
+        }
+        return uidObj.getUid();
+    }
+
     void getQuickNameIconForUid(Uid uidObj) {
         final int uid = uidObj.getUid();
         final String uidString = Integer.toString(uid);
@@ -123,27 +153,36 @@ class BatterySipper implements Comparable<BatterySipper> {
         } else {
             //name = packages[0];
         }
-        synchronized (mRequestQueue) {
-            mRequestQueue.add(this);
+        if (mHandler != null) {
+            synchronized (mRequestQueue) {
+                mRequestQueue.add(this);
+            }
         }
     }
 
+    public static void clearUidCache() {
+        sUidCache.clear();
+    }
+
     /**
-     * Sets name and icon
-     * @param uid Uid of the application
+     * Loads the app label and icon image and stores into the cache.
      */
-    void getNameIcon() {
+    public void loadNameAndIcon() {
+        // Bail out if the current sipper is not an App sipper.
+        if (uidObj == null) {
+            return;
+        }
         PackageManager pm = mContext.getPackageManager();
         final int uid = uidObj.getUid();
         final Drawable defaultActivityIcon = pm.getDefaultActivityIcon();
-        String[] packages = pm.getPackagesForUid(uid);
-        if (packages == null) {
+        mPackages = pm.getPackagesForUid(uid);
+        if (mPackages == null) {
             name = Integer.toString(uid);
             return;
         }
 
-        String[] packageLabels = new String[packages.length];
-        System.arraycopy(packages, 0, packageLabels, 0, packages.length);
+        String[] packageLabels = new String[mPackages.length];
+        System.arraycopy(mPackages, 0, packageLabels, 0, mPackages.length);
 
         int preferredIndex = -1;
         // Convert package names to user-facing labels where possible
@@ -157,7 +196,7 @@ class BatterySipper implements Comparable<BatterySipper> {
                     packageLabels[i] = label.toString();
                 }
                 if (ai.icon != 0) {
-                    defaultPackageName = packages[i];
+                    defaultPackageName = mPackages[i];
                     icon = ai.loadIcon(pm);
                     break;
                 }
@@ -170,7 +209,7 @@ class BatterySipper implements Comparable<BatterySipper> {
             name = packageLabels[0];
         } else {
             // Look for an official name for this UID.
-            for (String pkgName : packages) {
+            for (String pkgName : mPackages) {
                 try {
                     final PackageInfo pi = pm.getPackageInfo(pkgName, 0);
                     if (pi.sharedUserLabel != 0) {
@@ -195,6 +234,9 @@ class BatterySipper implements Comparable<BatterySipper> {
         utd.icon = icon;
         utd.packageName = defaultPackageName;
         sUidCache.put(uidString, utd);
-        mHandler.sendMessage(mHandler.obtainMessage(PowerUsageSummary.MSG_UPDATE_NAME_ICON, this));
+        if (mHandler != null) {
+            mHandler.sendMessage(
+                    mHandler.obtainMessage(BatteryStatsHelper.MSG_UPDATE_NAME_ICON, this));
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryStatsHelper.java b/src/com/android/settings/fuelgauge/BatteryStatsHelper.java
new file mode 100644
index 00000000000..71c69a3328f
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryStatsHelper.java
@@ -0,0 +1,827 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fuelgauge;
+
+import static android.os.BatteryStats.NETWORK_MOBILE_RX_BYTES;
+import static android.os.BatteryStats.NETWORK_MOBILE_TX_BYTES;
+import static android.os.BatteryStats.NETWORK_WIFI_RX_BYTES;
+import static android.os.BatteryStats.NETWORK_WIFI_TX_BYTES;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.graphics.drawable.Drawable;
+import android.hardware.Sensor;
+import android.hardware.SensorManager;
+import android.os.BatteryStats;
+import android.os.BatteryStats.Uid;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Parcel;
+import android.os.Process;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemClock;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.preference.PreferenceActivity;
+import android.telephony.SignalStrength;
+import android.util.Log;
+import android.util.SparseArray;
+
+import com.android.internal.app.IBatteryStats;
+import com.android.internal.os.BatteryStatsImpl;
+import com.android.internal.os.PowerProfile;
+import com.android.internal.util.FastPrintWriter;
+import com.android.settings.R;
+import com.android.settings.fuelgauge.PowerUsageDetail.DrainType;
+import com.android.settings.users.UserUtils;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * A helper class for retrieving the power usage information for all applications and services.
+ *
+ * The caller must initialize this class as soon as activity object is ready to use (for example, in
+ * onAttach() for Fragment), call create() in onCreate() and call destroy() in onDestroy().
+ */
+public class BatteryStatsHelper {
+
+    private static final boolean DEBUG = false;
+
+    private static final String TAG = BatteryStatsHelper.class.getSimpleName();
+
+    private static BatteryStatsImpl sStatsXfer;
+    private IBatteryStats mBatteryInfo;
+    private UserManager mUm;
+    private BatteryStatsImpl mStats;
+    private PowerProfile mPowerProfile;
+
+    private final List<BatterySipper> mUsageList = new ArrayList<BatterySipper>();
+    private final List<BatterySipper> mWifiSippers = new ArrayList<BatterySipper>();
+    private final List<BatterySipper> mBluetoothSippers = new ArrayList<BatterySipper>();
+    private final SparseArray<List<BatterySipper>> mUserSippers
+            = new SparseArray<List<BatterySipper>>();
+    private final SparseArray<Double> mUserPower = new SparseArray<Double>();
+
+    private int mStatsType = BatteryStats.STATS_SINCE_CHARGED;
+
+    private long mStatsPeriod = 0;
+    private double mMaxPower = 1;
+    private double mTotalPower;
+    private double mWifiPower;
+    private double mBluetoothPower;
+
+    // How much the apps together have left WIFI running.
+    private long mAppWifiRunning;
+
+    /** Queue for fetching name and icon for an application */
+    private ArrayList<BatterySipper> mRequestQueue = new ArrayList<BatterySipper>();
+
+    private Activity mActivity;
+    private Handler mHandler;
+
+    private class NameAndIconLoader extends Thread {
+        private boolean mAbort = false;
+
+        public NameAndIconLoader() {
+            super("BatteryUsage Icon Loader");
+        }
+
+        public void abort() {
+            mAbort = true;
+        }
+
+        @Override
+        public void run() {
+            while (true) {
+                BatterySipper bs;
+                synchronized (mRequestQueue) {
+                    if (mRequestQueue.isEmpty() || mAbort) {
+                        mHandler.sendEmptyMessage(MSG_REPORT_FULLY_DRAWN);
+                        return;
+                    }
+                    bs = mRequestQueue.remove(0);
+                }
+                bs.loadNameAndIcon();
+            }
+        }
+    }
+
+    private NameAndIconLoader mRequestThread;
+
+    public BatteryStatsHelper(Activity activity, Handler handler) {
+        mActivity = activity;
+        mHandler = handler;
+    }
+
+    /** Clears the current stats and forces recreating for future use. */
+    public void clearStats() {
+        mStats = null;
+    }
+
+    public BatteryStatsImpl getStats() {
+        if (mStats == null) {
+            load();
+        }
+        return mStats;
+    }
+
+    public PowerProfile getPowerProfile() {
+        return mPowerProfile;
+    }
+
+    public void create(Bundle icicle) {
+        if (icicle != null) {
+            mStats = sStatsXfer;
+        }
+        mBatteryInfo = IBatteryStats.Stub.asInterface(
+                ServiceManager.getService(BatteryStats.SERVICE_NAME));
+        mUm = (UserManager) mActivity.getSystemService(Context.USER_SERVICE);
+        mPowerProfile = new PowerProfile(mActivity);
+    }
+
+    public void pause() {
+        if (mRequestThread != null) {
+            mRequestThread.abort();
+        }
+    }
+
+    public void destroy() {
+        if (mActivity.isChangingConfigurations()) {
+            sStatsXfer = mStats;
+        } else {
+            BatterySipper.sUidCache.clear();
+        }
+    }
+
+    public void startBatteryDetailPage(
+            PreferenceActivity caller, BatterySipper sipper, boolean showLocationButton) {
+        // Initialize mStats if necessary.
+        getStats();
+
+        Bundle args = new Bundle();
+        args.putString(PowerUsageDetail.EXTRA_TITLE, sipper.name);
+        args.putInt(PowerUsageDetail.EXTRA_PERCENT, (int)
+                Math.ceil(sipper.getSortValue() * 100 / mTotalPower));
+        args.putInt(PowerUsageDetail.EXTRA_GAUGE, (int)
+                Math.ceil(sipper.getSortValue() * 100 / mMaxPower));
+        args.putLong(PowerUsageDetail.EXTRA_USAGE_DURATION, mStatsPeriod);
+        args.putString(PowerUsageDetail.EXTRA_ICON_PACKAGE, sipper.defaultPackageName);
+        args.putInt(PowerUsageDetail.EXTRA_ICON_ID, sipper.iconId);
+        args.putDouble(PowerUsageDetail.EXTRA_NO_COVERAGE, sipper.noCoveragePercent);
+        if (sipper.uidObj != null) {
+            args.putInt(PowerUsageDetail.EXTRA_UID, sipper.uidObj.getUid());
+        }
+        args.putSerializable(PowerUsageDetail.EXTRA_DRAIN_TYPE, sipper.drainType);
+        args.putBoolean(PowerUsageDetail.EXTRA_SHOW_LOCATION_BUTTON, showLocationButton);
+
+        int[] types;
+        double[] values;
+        switch (sipper.drainType) {
+            case APP:
+            case USER:
+            {
+                Uid uid = sipper.uidObj;
+                types = new int[] {
+                    R.string.usage_type_cpu,
+                    R.string.usage_type_cpu_foreground,
+                    R.string.usage_type_wake_lock,
+                    R.string.usage_type_gps,
+                    R.string.usage_type_wifi_running,
+                    R.string.usage_type_data_recv,
+                    R.string.usage_type_data_send,
+                    R.string.usage_type_data_wifi_recv,
+                    R.string.usage_type_data_wifi_send,
+                    R.string.usage_type_audio,
+                    R.string.usage_type_video,
+                };
+                values = new double[] {
+                    sipper.cpuTime,
+                    sipper.cpuFgTime,
+                    sipper.wakeLockTime,
+                    sipper.gpsTime,
+                    sipper.wifiRunningTime,
+                    sipper.mobileRxBytes,
+                    sipper.mobileTxBytes,
+                    sipper.wifiRxBytes,
+                    sipper.wifiTxBytes,
+                    0,
+                    0
+                };
+
+                if (sipper.drainType == DrainType.APP) {
+                    Writer result = new StringWriter();
+                    PrintWriter printWriter = new FastPrintWriter(result, false, 1024);
+                    mStats.dumpLocked(printWriter, "", mStatsType, uid.getUid());
+                    printWriter.flush();
+                    args.putString(PowerUsageDetail.EXTRA_REPORT_DETAILS, result.toString());
+
+                    result = new StringWriter();
+                    printWriter = new FastPrintWriter(result, false, 1024);
+                    mStats.dumpCheckinLocked(printWriter, mStatsType, uid.getUid());
+                    printWriter.flush();
+                    args.putString(PowerUsageDetail.EXTRA_REPORT_CHECKIN_DETAILS,
+                            result.toString());
+                }
+            }
+            break;
+            case CELL:
+            {
+                types = new int[] {
+                    R.string.usage_type_on_time,
+                    R.string.usage_type_no_coverage
+                };
+                values = new double[] {
+                    sipper.usageTime,
+                    sipper.noCoveragePercent
+                };
+            }
+            break;
+            case WIFI:
+            {
+                types = new int[] {
+                    R.string.usage_type_wifi_running,
+                    R.string.usage_type_cpu,
+                    R.string.usage_type_cpu_foreground,
+                    R.string.usage_type_wake_lock,
+                    R.string.usage_type_data_recv,
+                    R.string.usage_type_data_send,
+                    R.string.usage_type_data_wifi_recv,
+                    R.string.usage_type_data_wifi_send,
+                };
+                values = new double[] {
+                    sipper.usageTime,
+                    sipper.cpuTime,
+                    sipper.cpuFgTime,
+                    sipper.wakeLockTime,
+                    sipper.mobileRxBytes,
+                    sipper.mobileTxBytes,
+                    sipper.wifiRxBytes,
+                    sipper.wifiTxBytes,
+                };
+            } break;
+            case BLUETOOTH:
+            {
+                types = new int[] {
+                    R.string.usage_type_on_time,
+                    R.string.usage_type_cpu,
+                    R.string.usage_type_cpu_foreground,
+                    R.string.usage_type_wake_lock,
+                    R.string.usage_type_data_recv,
+                    R.string.usage_type_data_send,
+                    R.string.usage_type_data_wifi_recv,
+                    R.string.usage_type_data_wifi_send,
+                };
+                values = new double[] {
+                    sipper.usageTime,
+                    sipper.cpuTime,
+                    sipper.cpuFgTime,
+                    sipper.wakeLockTime,
+                    sipper.mobileRxBytes,
+                    sipper.mobileTxBytes,
+                    sipper.wifiRxBytes,
+                    sipper.wifiTxBytes,
+                };
+            } break;
+            default:
+            {
+                types = new int[] {
+                    R.string.usage_type_on_time
+                };
+                values = new double[] {
+                    sipper.usageTime
+                };
+            }
+        }
+        args.putIntArray(PowerUsageDetail.EXTRA_DETAIL_TYPES, types);
+        args.putDoubleArray(PowerUsageDetail.EXTRA_DETAIL_VALUES, values);
+        caller.startPreferencePanel(PowerUsageDetail.class.getName(), args,
+                R.string.details_title, null, null, 0);
+    }
+
+    /**
+     * Refreshes the power usage list.
+     * @param includeZeroConsumption whether includes those applications which have consumed very
+     *                               little power up till now.
+     */
+    public void refreshStats(boolean includeZeroConsumption) {
+        // Initialize mStats if necessary.
+        getStats();
+
+        mMaxPower = 0;
+        mTotalPower = 0;
+        mWifiPower = 0;
+        mBluetoothPower = 0;
+        mAppWifiRunning = 0;
+
+        mUsageList.clear();
+        mWifiSippers.clear();
+        mBluetoothSippers.clear();
+        mUserSippers.clear();
+        mUserPower.clear();
+
+        processAppUsage(includeZeroConsumption);
+        processMiscUsage();
+
+        Collections.sort(mUsageList);
+
+        if (mHandler != null) {
+            synchronized (mRequestQueue) {
+                if (!mRequestQueue.isEmpty()) {
+                    if (mRequestThread != null) {
+                        mRequestThread.abort();
+                    }
+                    mRequestThread = new NameAndIconLoader();
+                    mRequestThread.setPriority(Thread.MIN_PRIORITY);
+                    mRequestThread.start();
+                    mRequestQueue.notify();
+                }
+            }
+        }
+    }
+
+    private void processAppUsage(boolean includeZeroConsumption) {
+        SensorManager sensorManager = (SensorManager) mActivity.getSystemService(
+                Context.SENSOR_SERVICE);
+        final int which = mStatsType;
+        final int speedSteps = mPowerProfile.getNumSpeedSteps();
+        final double[] powerCpuNormal = new double[speedSteps];
+        final long[] cpuSpeedStepTimes = new long[speedSteps];
+        for (int p = 0; p < speedSteps; p++) {
+            powerCpuNormal[p] = mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_ACTIVE, p);
+        }
+        final double mobilePowerPerByte = getMobilePowerPerByte();
+        final double wifiPowerPerByte = getWifiPowerPerByte();
+        long uSecTime = mStats.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000, which);
+        long appWakelockTime = 0;
+        BatterySipper osApp = null;
+        mStatsPeriod = uSecTime;
+        SparseArray<? extends Uid> uidStats = mStats.getUidStats();
+        final int NU = uidStats.size();
+        for (int iu = 0; iu < NU; iu++) {
+            Uid u = uidStats.valueAt(iu);
+            double p; // in mAs
+            double power = 0; // in mAs
+            double highestDrain = 0;
+            String packageWithHighestDrain = null;
+            //mUsageList.add(new AppUsage(u.getUid(), new double[] {power}));
+            Map<String, ? extends BatteryStats.Uid.Proc> processStats = u.getProcessStats();
+            long cpuTime = 0;
+            long cpuFgTime = 0;
+            long wakelockTime = 0;
+            long gpsTime = 0;
+            if (DEBUG) Log.i(TAG, "UID " + u.getUid());
+            if (processStats.size() > 0) {
+                // Process CPU time
+                for (Map.Entry<String, ? extends BatteryStats.Uid.Proc> ent
+                        : processStats.entrySet()) {
+                    Uid.Proc ps = ent.getValue();
+                    final long userTime = ps.getUserTime(which);
+                    final long systemTime = ps.getSystemTime(which);
+                    final long foregroundTime = ps.getForegroundTime(which);
+                    cpuFgTime += foregroundTime * 10; // convert to millis
+                    final long tmpCpuTime = (userTime + systemTime) * 10; // convert to millis
+                    int totalTimeAtSpeeds = 0;
+                    // Get the total first
+                    for (int step = 0; step < speedSteps; step++) {
+                        cpuSpeedStepTimes[step] = ps.getTimeAtCpuSpeedStep(step, which);
+                        totalTimeAtSpeeds += cpuSpeedStepTimes[step];
+                    }
+                    if (totalTimeAtSpeeds == 0) totalTimeAtSpeeds = 1;
+                    // Then compute the ratio of time spent at each speed
+                    double processPower = 0;
+                    for (int step = 0; step < speedSteps; step++) {
+                        double ratio = (double) cpuSpeedStepTimes[step] / totalTimeAtSpeeds;
+                        processPower += ratio * tmpCpuTime * powerCpuNormal[step];
+                    }
+                    cpuTime += tmpCpuTime;
+                    if (DEBUG && processPower != 0) {
+                        Log.i(TAG, String.format("process %s, cpu power=%.2f",
+                                ent.getKey(), processPower / 1000));
+                    }
+                    power += processPower;
+                    if (packageWithHighestDrain == null
+                            || packageWithHighestDrain.startsWith("*")) {
+                        highestDrain = processPower;
+                        packageWithHighestDrain = ent.getKey();
+                    } else if (highestDrain < processPower
+                            && !ent.getKey().startsWith("*")) {
+                        highestDrain = processPower;
+                        packageWithHighestDrain = ent.getKey();
+                    }
+                }
+            }
+            if (cpuFgTime > cpuTime) {
+                if (DEBUG && cpuFgTime > cpuTime + 10000) {
+                    Log.i(TAG, "WARNING! Cputime is more than 10 seconds behind Foreground time");
+                }
+                cpuTime = cpuFgTime; // Statistics may not have been gathered yet.
+            }
+            power /= 1000;
+            if (DEBUG && power != 0) Log.i(TAG, String.format("total cpu power=%.2f", power));
+
+            // Process wake lock usage
+            Map<String, ? extends BatteryStats.Uid.Wakelock> wakelockStats = u.getWakelockStats();
+            for (Map.Entry<String, ? extends BatteryStats.Uid.Wakelock> wakelockEntry
+                    : wakelockStats.entrySet()) {
+                Uid.Wakelock wakelock = wakelockEntry.getValue();
+                // Only care about partial wake locks since full wake locks
+                // are canceled when the user turns the screen off.
+                BatteryStats.Timer timer = wakelock.getWakeTime(BatteryStats.WAKE_TYPE_PARTIAL);
+                if (timer != null) {
+                    wakelockTime += timer.getTotalTimeLocked(uSecTime, which);
+                }
+            }
+            wakelockTime /= 1000; // convert to millis
+            appWakelockTime += wakelockTime;
+
+            // Add cost of holding a wake lock
+            p = (wakelockTime
+                    * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000;
+            power += p;
+            if (DEBUG && p != 0) Log.i(TAG, String.format("wakelock power=%.2f", p));
+
+            // Add cost of mobile traffic
+            final long mobileRx = u.getNetworkActivityCount(NETWORK_MOBILE_RX_BYTES, mStatsType);
+            final long mobileTx = u.getNetworkActivityCount(NETWORK_MOBILE_TX_BYTES, mStatsType);
+            p = (mobileRx + mobileTx) * mobilePowerPerByte;
+            power += p;
+            if (DEBUG && p != 0) Log.i(TAG, String.format("mobile power=%.2f", p));
+
+            // Add cost of wifi traffic
+            final long wifiRx = u.getNetworkActivityCount(NETWORK_WIFI_RX_BYTES, mStatsType);
+            final long wifiTx = u.getNetworkActivityCount(NETWORK_WIFI_TX_BYTES, mStatsType);
+            p = (wifiRx + wifiTx) * wifiPowerPerByte;
+            power += p;
+            if (DEBUG && p != 0) Log.i(TAG, String.format("wifi power=%.2f", p));
+
+            // Add cost of keeping WIFI running.
+            long wifiRunningTimeMs = u.getWifiRunningTime(uSecTime, which) / 1000;
+            mAppWifiRunning += wifiRunningTimeMs;
+            p = (wifiRunningTimeMs
+                    * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)) / 1000;
+            power += p;
+            if (DEBUG && p != 0) Log.i(TAG, String.format("wifi running power=%.2f", p));
+
+            // Add cost of WIFI scans
+            long wifiScanTimeMs = u.getWifiScanTime(uSecTime, which) / 1000;
+            p = (wifiScanTimeMs
+                    * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_SCAN)) / 1000;
+            power += p;
+            if (DEBUG && p != 0) Log.i(TAG, String.format("wifi scanning power=%.2f", p));
+
+            // Process Sensor usage
+            Map<Integer, ? extends BatteryStats.Uid.Sensor> sensorStats = u.getSensorStats();
+            for (Map.Entry<Integer, ? extends BatteryStats.Uid.Sensor> sensorEntry
+                    : sensorStats.entrySet()) {
+                Uid.Sensor sensor = sensorEntry.getValue();
+                int sensorHandle = sensor.getHandle();
+                BatteryStats.Timer timer = sensor.getSensorTime();
+                long sensorTime = timer.getTotalTimeLocked(uSecTime, which) / 1000;
+                double multiplier = 0;
+                switch (sensorHandle) {
+                    case Uid.Sensor.GPS:
+                        multiplier = mPowerProfile.getAveragePower(PowerProfile.POWER_GPS_ON);
+                        gpsTime = sensorTime;
+                        break;
+                    default:
+                        List<Sensor> sensorList = sensorManager.getSensorList(
+                                android.hardware.Sensor.TYPE_ALL);
+                        for (android.hardware.Sensor s : sensorList) {
+                            if (s.getHandle() == sensorHandle) {
+                                multiplier = s.getPower();
+                                break;
+                            }
+                        }
+                }
+                p = (multiplier * sensorTime) / 1000;
+                power += p;
+                if (DEBUG && p != 0) {
+                    Log.i(TAG, String.format("sensor %s power=%.2f", sensor.toString(), p));
+                }
+            }
+
+            if (DEBUG) Log.i(TAG, String.format("UID %d total power=%.2f", u.getUid(), power));
+
+            // Add the app to the list if it is consuming power
+            boolean isOtherUser = false;
+            final int userId = UserHandle.getUserId(u.getUid());
+            if (power != 0 || includeZeroConsumption || u.getUid() == 0) {
+                BatterySipper app = new BatterySipper(mActivity, mRequestQueue, mHandler,
+                        packageWithHighestDrain, DrainType.APP, 0, u,
+                        new double[] {power});
+                app.cpuTime = cpuTime;
+                app.gpsTime = gpsTime;
+                app.wifiRunningTime = wifiRunningTimeMs;
+                app.cpuFgTime = cpuFgTime;
+                app.wakeLockTime = wakelockTime;
+                app.mobileRxBytes = mobileRx;
+                app.mobileTxBytes = mobileTx;
+                app.wifiRxBytes = wifiRx;
+                app.wifiTxBytes = wifiTx;
+                if (u.getUid() == Process.WIFI_UID) {
+                    mWifiSippers.add(app);
+                } else if (u.getUid() == Process.BLUETOOTH_UID) {
+                    mBluetoothSippers.add(app);
+                } else if (userId != UserHandle.myUserId()
+                        && UserHandle.getAppId(u.getUid()) >= Process.FIRST_APPLICATION_UID) {
+                    isOtherUser = true;
+                    List<BatterySipper> list = mUserSippers.get(userId);
+                    if (list == null) {
+                        list = new ArrayList<BatterySipper>();
+                        mUserSippers.put(userId, list);
+                    }
+                    list.add(app);
+                } else {
+                    mUsageList.add(app);
+                }
+                if (u.getUid() == 0) {
+                    osApp = app;
+                }
+            }
+            if (power != 0 || includeZeroConsumption) {
+                if (u.getUid() == Process.WIFI_UID) {
+                    mWifiPower += power;
+                } else if (u.getUid() == Process.BLUETOOTH_UID) {
+                    mBluetoothPower += power;
+                } else if (isOtherUser) {
+                    Double userPower = mUserPower.get(userId);
+                    if (userPower == null) {
+                        userPower = power;
+                    } else {
+                        userPower += power;
+                    }
+                    mUserPower.put(userId, userPower);
+                } else {
+                    if (power > mMaxPower) mMaxPower = power;
+                    mTotalPower += power;
+                }
+            }
+        }
+
+        // The device has probably been awake for longer than the screen on
+        // time and application wake lock time would account for.  Assign
+        // this remainder to the OS, if possible.
+        if (osApp != null) {
+            long wakeTimeMillis = mStats.computeBatteryUptime(
+                    SystemClock.uptimeMillis() * 1000, which) / 1000;
+            wakeTimeMillis -= appWakelockTime + (mStats.getScreenOnTime(
+                    SystemClock.elapsedRealtime(), which) / 1000);
+            if (wakeTimeMillis > 0) {
+                double power = (wakeTimeMillis
+                        * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000;
+                if (DEBUG) Log.i(TAG, "OS wakeLockTime " + wakeTimeMillis + " power " + power);
+                osApp.wakeLockTime += wakeTimeMillis;
+                osApp.value += power;
+                osApp.values[0] += power;
+                if (osApp.value > mMaxPower) mMaxPower = osApp.value;
+                mTotalPower += power;
+            }
+        }
+    }
+
+    private void addPhoneUsage(long uSecNow) {
+        long phoneOnTimeMs = mStats.getPhoneOnTime(uSecNow, mStatsType) / 1000;
+        double phoneOnPower = mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ACTIVE)
+                * phoneOnTimeMs / 1000;
+        addEntry(mActivity.getString(R.string.power_phone), DrainType.PHONE, phoneOnTimeMs,
+                R.drawable.ic_settings_voice_calls, phoneOnPower);
+    }
+
+    private void addScreenUsage(long uSecNow) {
+        double power = 0;
+        long screenOnTimeMs = mStats.getScreenOnTime(uSecNow, mStatsType) / 1000;
+        power += screenOnTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_SCREEN_ON);
+        final double screenFullPower =
+                mPowerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL);
+        for (int i = 0; i < BatteryStats.NUM_SCREEN_BRIGHTNESS_BINS; i++) {
+            double screenBinPower = screenFullPower * (i + 0.5f)
+                    / BatteryStats.NUM_SCREEN_BRIGHTNESS_BINS;
+            long brightnessTime = mStats.getScreenBrightnessTime(i, uSecNow, mStatsType) / 1000;
+            power += screenBinPower * brightnessTime;
+            if (DEBUG) {
+                Log.i(TAG, "Screen bin power = " + (int) screenBinPower + ", time = "
+                        + brightnessTime);
+            }
+        }
+        power /= 1000; // To seconds
+        addEntry(mActivity.getString(R.string.power_screen), DrainType.SCREEN, screenOnTimeMs,
+                R.drawable.ic_settings_display, power);
+    }
+
+    private void addRadioUsage(long uSecNow) {
+        double power = 0;
+        final int BINS = SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
+        long signalTimeMs = 0;
+        for (int i = 0; i < BINS; i++) {
+            long strengthTimeMs = mStats.getPhoneSignalStrengthTime(i, uSecNow, mStatsType) / 1000;
+            power += strengthTimeMs / 1000
+                    * mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ON, i);
+            signalTimeMs += strengthTimeMs;
+        }
+        long scanningTimeMs = mStats.getPhoneSignalScanningTime(uSecNow, mStatsType) / 1000;
+        power += scanningTimeMs / 1000 * mPowerProfile.getAveragePower(
+                PowerProfile.POWER_RADIO_SCANNING);
+        BatterySipper bs =
+                addEntry(mActivity.getString(R.string.power_cell), DrainType.CELL,
+                        signalTimeMs, R.drawable.ic_settings_cell_standby, power);
+        if (signalTimeMs != 0) {
+            bs.noCoveragePercent = mStats.getPhoneSignalStrengthTime(0, uSecNow, mStatsType)
+                    / 1000 * 100.0 / signalTimeMs;
+        }
+    }
+
+    private void aggregateSippers(BatterySipper bs, List<BatterySipper> from, String tag) {
+        for (int i=0; i<from.size(); i++) {
+            BatterySipper wbs = from.get(i);
+            if (DEBUG) Log.i(TAG, tag + " adding sipper " + wbs + ": cpu=" + wbs.cpuTime);
+            bs.cpuTime += wbs.cpuTime;
+            bs.gpsTime += wbs.gpsTime;
+            bs.wifiRunningTime += wbs.wifiRunningTime;
+            bs.cpuFgTime += wbs.cpuFgTime;
+            bs.wakeLockTime += wbs.wakeLockTime;
+            bs.mobileRxBytes += wbs.mobileRxBytes;
+            bs.mobileTxBytes += wbs.mobileTxBytes;
+            bs.wifiRxBytes += wbs.wifiRxBytes;
+            bs.wifiTxBytes += wbs.wifiTxBytes;
+        }
+    }
+
+    private void addWiFiUsage(long uSecNow) {
+        long onTimeMs = mStats.getWifiOnTime(uSecNow, mStatsType) / 1000;
+        long runningTimeMs = mStats.getGlobalWifiRunningTime(uSecNow, mStatsType) / 1000;
+        if (DEBUG) Log.i(TAG, "WIFI runningTime=" + runningTimeMs
+                + " app runningTime=" + mAppWifiRunning);
+        runningTimeMs -= mAppWifiRunning;
+        if (runningTimeMs < 0) runningTimeMs = 0;
+        double wifiPower = (onTimeMs * 0 /* TODO */
+                * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)
+            + runningTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)) / 1000;
+        if (DEBUG) Log.i(TAG, "WIFI power=" + wifiPower + " from procs=" + mWifiPower);
+        BatterySipper bs = addEntry(mActivity.getString(R.string.power_wifi), DrainType.WIFI,
+                runningTimeMs, R.drawable.ic_settings_wifi, wifiPower + mWifiPower);
+        aggregateSippers(bs, mWifiSippers, "WIFI");
+    }
+
+    private void addIdleUsage(long uSecNow) {
+        long idleTimeMs = (uSecNow - mStats.getScreenOnTime(uSecNow, mStatsType)) / 1000;
+        double idlePower = (idleTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_IDLE))
+                / 1000;
+        addEntry(mActivity.getString(R.string.power_idle), DrainType.IDLE, idleTimeMs,
+                R.drawable.ic_settings_phone_idle, idlePower);
+    }
+
+    private void addBluetoothUsage(long uSecNow) {
+        long btOnTimeMs = mStats.getBluetoothOnTime(uSecNow, mStatsType) / 1000;
+        double btPower = btOnTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_BLUETOOTH_ON)
+                / 1000;
+        int btPingCount = mStats.getBluetoothPingCount();
+        btPower += (btPingCount
+                * mPowerProfile.getAveragePower(PowerProfile.POWER_BLUETOOTH_AT_CMD)) / 1000;
+        BatterySipper bs = addEntry(mActivity.getString(R.string.power_bluetooth),
+                DrainType.BLUETOOTH, btOnTimeMs, R.drawable.ic_settings_bluetooth,
+                btPower + mBluetoothPower);
+        aggregateSippers(bs, mBluetoothSippers, "Bluetooth");
+    }
+
+    private void addUserUsage() {
+        for (int i=0; i<mUserSippers.size(); i++) {
+            final int userId = mUserSippers.keyAt(i);
+            final List<BatterySipper> sippers = mUserSippers.valueAt(i);
+            UserInfo info = mUm.getUserInfo(userId);
+            Drawable icon;
+            String name;
+            if (info != null) {
+                icon = UserUtils.getUserIcon(mActivity, mUm, info, mActivity.getResources());
+                name = info != null ? info.name : null;
+                if (name == null) {
+                    name = Integer.toString(info.id);
+                }
+                name = mActivity.getResources().getString(
+                        R.string.running_process_item_user_label, name);
+            } else {
+                icon = null;
+                name = mActivity.getResources().getString(
+                        R.string.running_process_item_removed_user_label);
+            }
+            Double userPower = mUserPower.get(userId);
+            double power = (userPower != null) ? userPower : 0.0;
+            BatterySipper bs = addEntry(name, DrainType.USER, 0, 0, power);
+            bs.icon = icon;
+            aggregateSippers(bs, sippers, "User");
+        }
+    }
+
+    /**
+     * Return estimated power (in mAs) of sending a byte with the mobile radio.
+     */
+    private double getMobilePowerPerByte() {
+        final long MOBILE_BPS = 200000; // TODO: Extract average bit rates from system
+        final double MOBILE_POWER = mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ACTIVE)
+                / 3600;
+
+        final long mobileRx = mStats.getNetworkActivityCount(NETWORK_MOBILE_RX_BYTES, mStatsType);
+        final long mobileTx = mStats.getNetworkActivityCount(NETWORK_MOBILE_TX_BYTES, mStatsType);
+        final long mobileData = mobileRx + mobileTx;
+
+        final long radioDataUptimeMs = mStats.getRadioDataUptime() / 1000;
+        final long mobileBps = radioDataUptimeMs != 0
+                ? mobileData * 8 * 1000 / radioDataUptimeMs
+                : MOBILE_BPS;
+
+        return MOBILE_POWER / (mobileBps / 8);
+    }
+
+    /**
+     * Return estimated power (in mAs) of sending a byte with the Wi-Fi radio.
+     */
+    private double getWifiPowerPerByte() {
+        final long WIFI_BPS = 1000000; // TODO: Extract average bit rates from system
+        final double WIFI_POWER = mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ACTIVE)
+                / 3600;
+        return WIFI_POWER / (WIFI_BPS / 8);
+    }
+
+    private void processMiscUsage() {
+        final int which = mStatsType;
+        long uSecTime = SystemClock.elapsedRealtime() * 1000;
+        final long uSecNow = mStats.computeBatteryRealtime(uSecTime, which);
+        final long timeSinceUnplugged = uSecNow;
+        if (DEBUG) {
+            Log.i(TAG, "Uptime since last unplugged = " + (timeSinceUnplugged / 1000));
+        }
+
+        addUserUsage();
+        addPhoneUsage(uSecNow);
+        addScreenUsage(uSecNow);
+        addWiFiUsage(uSecNow);
+        addBluetoothUsage(uSecNow);
+        addIdleUsage(uSecNow); // Not including cellular idle power
+        // Don't compute radio usage if it's a wifi-only device
+        if (!com.android.settings.Utils.isWifiOnly(mActivity)) {
+            addRadioUsage(uSecNow);
+        }
+    }
+
+    private BatterySipper addEntry(String label, DrainType drainType, long time, int iconId,
+            double power) {
+        if (power > mMaxPower) mMaxPower = power;
+        mTotalPower += power;
+        BatterySipper bs = new BatterySipper(mActivity, mRequestQueue, mHandler,
+                label, drainType, iconId, null, new double[] {power});
+        bs.usageTime = time;
+        bs.iconId = iconId;
+        mUsageList.add(bs);
+        return bs;
+    }
+
+    public List<BatterySipper> getUsageList() {
+        return mUsageList;
+    }
+
+    static final int MSG_UPDATE_NAME_ICON = 1;
+    static final int MSG_REPORT_FULLY_DRAWN = 2;
+
+    public double getMaxPower() {
+        return mMaxPower;
+    }
+
+    public double getTotalPower() {
+        return mTotalPower;
+    }
+
+    private void load() {
+        try {
+            byte[] data = mBatteryInfo.getStatistics();
+            Parcel parcel = Parcel.obtain();
+            parcel.unmarshall(data, 0, data.length);
+            parcel.setDataPosition(0);
+            mStats = com.android.internal.os.BatteryStatsImpl.CREATOR
+                    .createFromParcel(parcel);
+            mStats.distributeWorkLocked(BatteryStats.STATS_SINCE_CHARGED);
+        } catch (RemoteException e) {
+            Log.e(TAG, "RemoteException:", e);
+        }
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index 8ecc659f329..45e45165528 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -36,6 +36,7 @@ import android.graphics.drawable.Drawable;
 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;
@@ -49,11 +50,11 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.android.settings.DisplaySettings;
-import com.android.settings.LocationSettings;
 import com.android.settings.R;
 import com.android.settings.WirelessSettings;
 import com.android.settings.applications.InstalledAppDetails;
 import com.android.settings.bluetooth.BluetoothSettings;
+import com.android.settings.location.LocationSettings;
 import com.android.settings.wifi.WifiSettings;
 
 public class PowerUsageDetail extends Fragment implements Button.OnClickListener {
@@ -107,6 +108,7 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener
     public static final String EXTRA_ICON_PACKAGE = "iconPackage"; // String
     public static final String EXTRA_NO_COVERAGE = "noCoverage";
     public static final String EXTRA_ICON_ID = "iconId"; // Int
+    public static final String EXTRA_SHOW_LOCATION_BUTTON = "showLocationButton";  // Boolean
 
     private PackageManager mPm;
     private DevicePolicyManager mDpm;
@@ -128,13 +130,14 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener
     private double mNoCoverage; // Percentage of time that there was no coverage
 
     private boolean mUsesGps;
+    private boolean mShowLocationButton;
 
     private static final String TAG = "PowerUsageDetail";
     private String[] mPackages;
 
     ApplicationInfo mApp;
     ComponentName mInstaller;
-    
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -176,6 +179,7 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener
         mNoCoverage = args.getDouble(EXTRA_NO_COVERAGE, 0);
         String iconPackage = args.getString(EXTRA_ICON_PACKAGE);
         int iconId = args.getInt(EXTRA_ICON_ID, 0);
+        mShowLocationButton = args.getBoolean(EXTRA_SHOW_LOCATION_BUTTON);
         if (!TextUtils.isEmpty(iconPackage)) {
             try {
                 final PackageManager pm = getActivity().getPackageManager();
@@ -316,6 +320,8 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener
                 switch (mTypes[i]) {
                     case R.string.usage_type_data_recv:
                     case R.string.usage_type_data_send:
+                    case R.string.usage_type_data_wifi_recv:
+                    case R.string.usage_type_data_wifi_send:
                         final long bytes = (long) (mValues[i]);
                         value = Formatter.formatFileSize(getActivity(), bytes);
                         break;
@@ -327,7 +333,7 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener
                         mUsesGps = true;
                         // Fall through
                     default:
-                        value = Utils.formatElapsedTime(getActivity(), mValues[i]);
+                        value = Utils.formatElapsedTime(getActivity(), mValues[i], true);
                 }
                 ViewGroup item = (ViewGroup) inflater.inflate(R.layout.power_usage_detail_item_text,
                         null);
@@ -348,20 +354,21 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener
             pi = packages != null ? pm.getPackageInfo(packages[0], 0) : null;
         } catch (NameNotFoundException nnfe) { /* Nothing */ }
         ApplicationInfo ai = pi != null? pi.applicationInfo : null;
-        boolean isSystem = ai != null? (ai.flags & ApplicationInfo.FLAG_SYSTEM) != 0 : false;
 
         boolean removeHeader = true;
         switch (mDrainType) {
             case APP:
-                // If it is a Java application and it's not a system application
-                if (packages != null && !isSystem) {
+                // If it is a Java application and only one package is associated with the Uid
+                if (packages != null && packages.length == 1) {
                     addControl(R.string.battery_action_app_details,
                             R.string.battery_sugg_apps_info, ACTION_APP_DETAILS);
                     removeHeader = false;
                     // If the application has a settings screen, jump to  that
                     // TODO:
                 }
-                if (mUsesGps) {
+                // If power usage detail page is launched from location page, suppress "Location"
+                // button to prevent circular loops.
+                if (mUsesGps && mShowLocationButton) {
                     addControl(R.string.location_settings_title,
                             R.string.battery_sugg_apps_gps, ACTION_LOCATION_SETTINGS);
                     removeHeader = false;
@@ -464,7 +471,7 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener
                 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);
+        intent.putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.getUserId(mUid));
         getActivity().sendOrderedBroadcast(intent, null, mCheckKillProcessesReceiver, null,
                 Activity.RESULT_CANCELED, null, null);
     }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 2a3d5f86eef..dc86b8de210 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -16,61 +16,37 @@
 
 package com.android.settings.fuelgauge;
 
+import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.pm.UserInfo;
-import android.graphics.drawable.Drawable;
-import android.hardware.Sensor;
-import android.hardware.SensorManager;
-import android.net.Uri;
 import android.os.BatteryStats;
-import android.os.BatteryStats.Uid;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Parcel;
-import android.os.Process;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.SystemClock;
-import android.os.UserHandle;
-import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
-import android.telephony.SignalStrength;
 import android.text.TextUtils;
-import android.util.Log;
-import android.util.SparseArray;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import com.android.internal.app.IBatteryStats;
-import com.android.internal.os.BatteryStatsImpl;
 import com.android.internal.os.PowerProfile;
 import com.android.settings.HelpUtils;
 import com.android.settings.R;
-import com.android.settings.fuelgauge.PowerUsageDetail.DrainType;
-import com.android.settings.users.UserUtils;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Displays a list of apps and subsystems that consume power, ordered by how much power was
  * consumed since the last time it was unplugged.
  */
-public class PowerUsageSummary extends PreferenceFragment implements Runnable {
+public class PowerUsageSummary extends PreferenceFragment {
 
     private static final boolean DEBUG = false;
 
@@ -83,18 +59,6 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
     private static final int MENU_STATS_REFRESH = Menu.FIRST + 1;
     private static final int MENU_HELP = Menu.FIRST + 2;
 
-    private static BatteryStatsImpl sStatsXfer;
-
-    IBatteryStats mBatteryInfo;
-    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;
 
@@ -103,20 +67,7 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
     private static final int MIN_POWER_THRESHOLD = 5;
     private static final int MAX_ITEMS_TO_LIST = 10;
 
-    private long mStatsPeriod = 0;
-    private double mMaxPower = 1;
-    private double mTotalPower;
-    private double mWifiPower;
-    private double mBluetoothPower;
-    private PowerProfile mPowerProfile;
-
-    // How much the apps together have left WIFI running.
-    private long mAppWifiRunning;
-
-    /** Queue for fetching name and icon for an application */
-    private ArrayList<BatterySipper> mRequestQueue = new ArrayList<BatterySipper>();
-    private Thread mRequestThread;
-    private boolean mAbort;
+    private BatteryStatsHelper mStatsHelper;
 
     private BroadcastReceiver mBatteryInfoReceiver = new BroadcastReceiver() {
 
@@ -130,34 +81,32 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
                 String batterySummary = context.getResources().getString(
                         R.string.power_usage_level_and_status, batteryLevel, batteryStatus);
                 mBatteryStatusPref.setTitle(batterySummary);
-                mStats = null;
+                mStatsHelper.clearStats();
                 refreshStats();
             }
         }
     };
 
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        mStatsHelper = new BatteryStatsHelper(activity, mHandler);
+    }
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-
-        if (icicle != null) {
-            mStats = sStatsXfer;
-        }
+        mStatsHelper.create(icicle);
 
         addPreferencesFromResource(R.xml.power_usage_summary);
-        mBatteryInfo = IBatteryStats.Stub.asInterface(
-                ServiceManager.getService("batteryinfo"));
-        mUm = (UserManager)getActivity().getSystemService(Context.USER_SERVICE);
         mAppListGroup = (PreferenceGroup) findPreference(KEY_APP_LIST);
         mBatteryStatusPref = mAppListGroup.findPreference(KEY_BATTERY_STATUS);
-        mPowerProfile = new PowerProfile(getActivity());
         setHasOptionsMenu(true);
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        mAbort = false;
         getActivity().registerReceiver(mBatteryInfoReceiver,
                 new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
         refreshStats();
@@ -165,10 +114,8 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
 
     @Override
     public void onPause() {
-        synchronized (mRequestQueue) {
-            mAbort = true;
-        }
-        mHandler.removeMessages(MSG_UPDATE_NAME_ICON);
+        mStatsHelper.pause();
+        mHandler.removeMessages(BatteryStatsHelper.MSG_UPDATE_NAME_ICON);
         getActivity().unregisterReceiver(mBatteryInfoReceiver);
         super.onPause();
     }
@@ -176,18 +123,14 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (getActivity().isChangingConfigurations()) {
-            sStatsXfer = mStats;
-        } else {
-            BatterySipper.sUidCache.clear();
-        }
+        mStatsHelper.destroy();
     }
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         if (preference instanceof BatteryHistoryPreference) {
             Parcel hist = Parcel.obtain();
-            mStats.writeToParcelWithoutUids(hist, 0);
+            mStatsHelper.getStats().writeToParcelWithoutUids(hist, 0);
             byte[] histData = hist.marshall();
             Bundle args = new Bundle();
             args.putByteArray(BatteryHistoryDetail.EXTRA_STATS, histData);
@@ -201,131 +144,7 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
         }
         PowerGaugePreference pgp = (PowerGaugePreference) preference;
         BatterySipper sipper = pgp.getInfo();
-        Bundle args = new Bundle();
-        args.putString(PowerUsageDetail.EXTRA_TITLE, sipper.name);
-        args.putInt(PowerUsageDetail.EXTRA_PERCENT, (int)
-                Math.ceil(sipper.getSortValue() * 100 / mTotalPower));
-        args.putInt(PowerUsageDetail.EXTRA_GAUGE, (int)
-                Math.ceil(sipper.getSortValue() * 100 / mMaxPower));
-        args.putLong(PowerUsageDetail.EXTRA_USAGE_DURATION, mStatsPeriod);
-        args.putString(PowerUsageDetail.EXTRA_ICON_PACKAGE, sipper.defaultPackageName);
-        args.putInt(PowerUsageDetail.EXTRA_ICON_ID, sipper.iconId);
-        args.putDouble(PowerUsageDetail.EXTRA_NO_COVERAGE, sipper.noCoveragePercent);
-        if (sipper.uidObj != null) {
-            args.putInt(PowerUsageDetail.EXTRA_UID, sipper.uidObj.getUid());
-        }
-        args.putSerializable(PowerUsageDetail.EXTRA_DRAIN_TYPE, sipper.drainType);
-
-        int[] types;
-        double[] values;
-        switch (sipper.drainType) {
-            case APP:
-            case USER:
-            {
-                Uid uid = sipper.uidObj;
-                types = new int[] {
-                    R.string.usage_type_cpu,
-                    R.string.usage_type_cpu_foreground,
-                    R.string.usage_type_wake_lock,
-                    R.string.usage_type_gps,
-                    R.string.usage_type_wifi_running,
-                    R.string.usage_type_data_send,
-                    R.string.usage_type_data_recv,
-                    R.string.usage_type_audio,
-                    R.string.usage_type_video,
-                };
-                values = new double[] {
-                    sipper.cpuTime,
-                    sipper.cpuFgTime,
-                    sipper.wakeLockTime,
-                    sipper.gpsTime,
-                    sipper.wifiRunningTime,
-                    sipper.tcpBytesSent,
-                    sipper.tcpBytesReceived,
-                    0,
-                    0
-                };
-
-                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:
-            {
-                types = new int[] {
-                    R.string.usage_type_on_time,
-                    R.string.usage_type_no_coverage
-                };
-                values = new double[] {
-                    sipper.usageTime,
-                    sipper.noCoveragePercent
-                };
-            }
-            break;
-            case WIFI:
-            {
-                types = new int[] {
-                    R.string.usage_type_wifi_running,
-                    R.string.usage_type_cpu,
-                    R.string.usage_type_cpu_foreground,
-                    R.string.usage_type_wake_lock,
-                    R.string.usage_type_data_send,
-                    R.string.usage_type_data_recv,
-                };
-                values = new double[] {
-                    sipper.usageTime,
-                    sipper.cpuTime,
-                    sipper.cpuFgTime,
-                    sipper.wakeLockTime,
-                    sipper.tcpBytesSent,
-                    sipper.tcpBytesReceived,
-                };
-            } break;
-            case BLUETOOTH:
-            {
-                types = new int[] {
-                    R.string.usage_type_on_time,
-                    R.string.usage_type_cpu,
-                    R.string.usage_type_cpu_foreground,
-                    R.string.usage_type_wake_lock,
-                    R.string.usage_type_data_send,
-                    R.string.usage_type_data_recv,
-                };
-                values = new double[] {
-                    sipper.usageTime,
-                    sipper.cpuTime,
-                    sipper.cpuFgTime,
-                    sipper.wakeLockTime,
-                    sipper.tcpBytesSent,
-                    sipper.tcpBytesReceived,
-                };
-            } break;
-            default:
-            {
-                types = new int[] {
-                    R.string.usage_type_on_time
-                };
-                values = new double[] {
-                    sipper.usageTime
-                };
-            }
-        }
-        args.putIntArray(PowerUsageDetail.EXTRA_DETAIL_TYPES, types);
-        args.putDoubleArray(PowerUsageDetail.EXTRA_DETAIL_VALUES, values);
-        PreferenceActivity pa = (PreferenceActivity)getActivity();
-        pa.startPreferencePanel(PowerUsageDetail.class.getName(), args,
-                R.string.details_title, null, null, 0);
-
+        mStatsHelper.startBatteryDetailPage((PreferenceActivity) getActivity(), sipper, true);
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
@@ -361,7 +180,7 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
                 refreshStats();
                 return true;
             case MENU_STATS_REFRESH:
-                mStats = null;
+                mStatsHelper.clearStats();
                 refreshStats();
                 return true;
             default:
@@ -376,43 +195,32 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
     }
 
     private void refreshStats() {
-        if (mStats == null) {
-            load();
-        }
-        mMaxPower = 0;
-        mTotalPower = 0;
-        mWifiPower = 0;
-        mBluetoothPower = 0;
-        mAppWifiRunning = 0;
-
         mAppListGroup.removeAll();
-        mUsageList.clear();
-        mWifiSippers.clear();
-        mBluetoothSippers.clear();
-        mUserSippers.clear();
-        mUserPower.clear();
         mAppListGroup.setOrderingAsAdded(false);
 
         mBatteryStatusPref.setOrder(-2);
         mAppListGroup.addPreference(mBatteryStatusPref);
-        BatteryHistoryPreference hist = new BatteryHistoryPreference(getActivity(), mStats);
+        BatteryHistoryPreference hist = new BatteryHistoryPreference(
+                getActivity(), mStatsHelper.getStats());
         hist.setOrder(-1);
         mAppListGroup.addPreference(hist);
-        
-        if (mPowerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL) < 10) {
+
+        if (mStatsHelper.getPowerProfile().getAveragePower(
+                PowerProfile.POWER_SCREEN_FULL) < 10) {
             addNotAvailableMessage();
             return;
         }
-        processAppUsage();
-        processMiscUsage();
-
-        Collections.sort(mUsageList);
-        for (BatterySipper sipper : mUsageList) {
+        mStatsHelper.refreshStats(false);
+        List<BatterySipper> usageList = mStatsHelper.getUsageList();
+        for (BatterySipper sipper : usageList) {
             if (sipper.getSortValue() < MIN_POWER_THRESHOLD) continue;
-            final double percentOfTotal =  ((sipper.getSortValue() / mTotalPower) * 100);
+            final double percentOfTotal =
+                    ((sipper.getSortValue() / mStatsHelper.getTotalPower()) * 100);
             if (percentOfTotal < 1) continue;
-            PowerGaugePreference pref = new PowerGaugePreference(getActivity(), sipper.getIcon(), sipper);
-            final double percentOfMax = (sipper.getSortValue() * 100) / mMaxPower;
+            PowerGaugePreference pref =
+                    new PowerGaugePreference(getActivity(), sipper.getIcon(), sipper);
+            final double percentOfMax =
+                    (sipper.getSortValue() * 100) / mStatsHelper.getMaxPower();
             sipper.percent = percentOfTotal;
             pref.setTitle(sipper.name);
             pref.setOrder(Integer.MAX_VALUE - (int) sipper.getSortValue()); // Invert the order
@@ -423,474 +231,16 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
             mAppListGroup.addPreference(pref);
             if (mAppListGroup.getPreferenceCount() > (MAX_ITEMS_TO_LIST+1)) break;
         }
-        synchronized (mRequestQueue) {
-            if (!mRequestQueue.isEmpty()) {
-                if (mRequestThread == null) {
-                    mRequestThread = new Thread(this, "BatteryUsage Icon Loader");
-                    mRequestThread.setPriority(Thread.MIN_PRIORITY);
-                    mRequestThread.start();
-                }
-                mRequestQueue.notify();
-            }
-        }
     }
 
-    private void processAppUsage() {
-        SensorManager sensorManager = (SensorManager)getActivity().getSystemService(
-                Context.SENSOR_SERVICE);
-        final int which = mStatsType;
-        final int speedSteps = mPowerProfile.getNumSpeedSteps();
-        final double[] powerCpuNormal = new double[speedSteps];
-        final long[] cpuSpeedStepTimes = new long[speedSteps];
-        for (int p = 0; p < speedSteps; p++) {
-            powerCpuNormal[p] = mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_ACTIVE, p);
-        }
-        final double averageCostPerByte = getAverageDataCost();
-        long uSecTime = mStats.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000, which);
-        long appWakelockTime = 0;
-        BatterySipper osApp = null;
-        mStatsPeriod = uSecTime;
-        SparseArray<? extends Uid> uidStats = mStats.getUidStats();
-        final int NU = uidStats.size();
-        for (int iu = 0; iu < NU; iu++) {
-            Uid u = uidStats.valueAt(iu);
-            double p;
-            double power = 0;
-            double highestDrain = 0;
-            String packageWithHighestDrain = null;
-            //mUsageList.add(new AppUsage(u.getUid(), new double[] {power}));
-            Map<String, ? extends BatteryStats.Uid.Proc> processStats = u.getProcessStats();
-            long cpuTime = 0;
-            long cpuFgTime = 0;
-            long wakelockTime = 0;
-            long gpsTime = 0;
-            if (DEBUG) Log.i(TAG, "UID " + u.getUid());
-            if (processStats.size() > 0) {
-                // Process CPU time
-                for (Map.Entry<String, ? extends BatteryStats.Uid.Proc> ent
-                        : processStats.entrySet()) {
-                    Uid.Proc ps = ent.getValue();
-                    final long userTime = ps.getUserTime(which);
-                    final long systemTime = ps.getSystemTime(which);
-                    final long foregroundTime = ps.getForegroundTime(which);
-                    cpuFgTime += foregroundTime * 10; // convert to millis
-                    final long tmpCpuTime = (userTime + systemTime) * 10; // convert to millis
-                    int totalTimeAtSpeeds = 0;
-                    // Get the total first
-                    for (int step = 0; step < speedSteps; step++) {
-                        cpuSpeedStepTimes[step] = ps.getTimeAtCpuSpeedStep(step, which);
-                        totalTimeAtSpeeds += cpuSpeedStepTimes[step];
-                    }
-                    if (totalTimeAtSpeeds == 0) totalTimeAtSpeeds = 1;
-                    // Then compute the ratio of time spent at each speed
-                    double processPower = 0;
-                    for (int step = 0; step < speedSteps; step++) {
-                        double ratio = (double) cpuSpeedStepTimes[step] / totalTimeAtSpeeds;
-                        processPower += ratio * tmpCpuTime * powerCpuNormal[step];
-                    }
-                    cpuTime += tmpCpuTime;
-                    if (DEBUG && processPower != 0) {
-                        Log.i(TAG, String.format("process %s, cpu power=%.2f",
-                                ent.getKey(), processPower / 1000));
-                    }
-                    power += processPower;
-                    if (packageWithHighestDrain == null
-                            || packageWithHighestDrain.startsWith("*")) {
-                        highestDrain = processPower;
-                        packageWithHighestDrain = ent.getKey();
-                    } else if (highestDrain < processPower
-                            && !ent.getKey().startsWith("*")) {
-                        highestDrain = processPower;
-                        packageWithHighestDrain = ent.getKey();
-                    }
-                }
-            }
-            if (cpuFgTime > cpuTime) {
-                if (DEBUG && cpuFgTime > cpuTime + 10000) {
-                    Log.i(TAG, "WARNING! Cputime is more than 10 seconds behind Foreground time");
-                }
-                cpuTime = cpuFgTime; // Statistics may not have been gathered yet.
-            }
-            power /= 1000;
-            if (DEBUG && power != 0) Log.i(TAG, String.format("total cpu power=%.2f", power));
-
-            // Process wake lock usage
-            Map<String, ? extends BatteryStats.Uid.Wakelock> wakelockStats = u.getWakelockStats();
-            for (Map.Entry<String, ? extends BatteryStats.Uid.Wakelock> wakelockEntry
-                    : wakelockStats.entrySet()) {
-                Uid.Wakelock wakelock = wakelockEntry.getValue();
-                // Only care about partial wake locks since full wake locks
-                // are canceled when the user turns the screen off.
-                BatteryStats.Timer timer = wakelock.getWakeTime(BatteryStats.WAKE_TYPE_PARTIAL);
-                if (timer != null) {
-                    wakelockTime += timer.getTotalTimeLocked(uSecTime, which);
-                }
-            }
-            wakelockTime /= 1000; // convert to millis
-            appWakelockTime += wakelockTime;
-
-            // Add cost of holding a wake lock
-            p = (wakelockTime
-                    * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000;
-            power += p;
-            if (DEBUG && p != 0) Log.i(TAG, String.format("wakelock power=%.2f", p));
-            
-            // Add cost of data traffic
-            long tcpBytesReceived = u.getTcpBytesReceived(mStatsType);
-            long tcpBytesSent = u.getTcpBytesSent(mStatsType);
-            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;
-            p = (wifiRunningTimeMs
-                    * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)) / 1000;
-            power += p;
-            if (DEBUG && p != 0) Log.i(TAG, String.format("wifi running power=%.2f", p));
-
-            // Add cost of WIFI scans
-            long wifiScanTimeMs = u.getWifiScanTime(uSecTime, which) / 1000;
-            p = (wifiScanTimeMs
-                    * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_SCAN)) / 1000;
-            power += p;
-            if (DEBUG && p != 0) Log.i(TAG, String.format("wifi scanning power=%.2f", p));
-
-            // Process Sensor usage
-            Map<Integer, ? extends BatteryStats.Uid.Sensor> sensorStats = u.getSensorStats();
-            for (Map.Entry<Integer, ? extends BatteryStats.Uid.Sensor> sensorEntry
-                    : sensorStats.entrySet()) {
-                Uid.Sensor sensor = sensorEntry.getValue();
-                int sensorHandle = sensor.getHandle();
-                BatteryStats.Timer timer = sensor.getSensorTime();
-                long sensorTime = timer.getTotalTimeLocked(uSecTime, which) / 1000;
-                double multiplier = 0;
-                switch (sensorHandle) {
-                    case Uid.Sensor.GPS:
-                        multiplier = mPowerProfile.getAveragePower(PowerProfile.POWER_GPS_ON);
-                        gpsTime = sensorTime;
-                        break;
-                    default:
-                        List<Sensor> sensorList = sensorManager.getSensorList(
-                                android.hardware.Sensor.TYPE_ALL);
-                        for (android.hardware.Sensor s : sensorList) {
-                            if (s.getHandle() == sensorHandle) {
-                                multiplier = s.getPower();
-                                break;
-                            }
-                        }
-                }
-                p = (multiplier * sensorTime) / 1000;
-                power += p;
-                if (DEBUG && p != 0) {
-                    Log.i(TAG, String.format("sensor %s power=%.2f", sensor.toString(), p));
-                }
-            }
-
-            if (DEBUG) Log.i(TAG, String.format("UID %d total power=%.2f", u.getUid(), power));
-
-            // Add the app to the list if it is consuming power
-            boolean isOtherUser = false;
-            final int userId = UserHandle.getUserId(u.getUid());
-            if (power != 0 || u.getUid() == 0) {
-                BatterySipper app = new BatterySipper(getActivity(), mRequestQueue, mHandler,
-                        packageWithHighestDrain, DrainType.APP, 0, u,
-                        new double[] {power});
-                app.cpuTime = cpuTime;
-                app.gpsTime = gpsTime;
-                app.wifiRunningTime = wifiRunningTimeMs;
-                app.cpuFgTime = cpuFgTime;
-                app.wakeLockTime = wakelockTime;
-                app.tcpBytesReceived = tcpBytesReceived;
-                app.tcpBytesSent = tcpBytesSent;
-                if (u.getUid() == Process.WIFI_UID) {
-                    mWifiSippers.add(app);
-                } else if (u.getUid() == Process.BLUETOOTH_UID) {
-                    mBluetoothSippers.add(app);
-                } else if (userId != UserHandle.myUserId()
-                        && UserHandle.getAppId(u.getUid()) >= Process.FIRST_APPLICATION_UID) {
-                    isOtherUser = true;
-                    List<BatterySipper> list = mUserSippers.get(userId);
-                    if (list == null) {
-                        list = new ArrayList<BatterySipper>();
-                        mUserSippers.put(userId, list);
-                    }
-                    list.add(app);
-                } else {
-                    mUsageList.add(app);
-                }
-                if (u.getUid() == 0) {
-                    osApp = app;
-                }
-            }
-            if (power != 0) {
-                if (u.getUid() == Process.WIFI_UID) {
-                    mWifiPower += power;
-                } else if (u.getUid() == Process.BLUETOOTH_UID) {
-                    mBluetoothPower += power;
-                } else if (isOtherUser) {
-                    Double userPower = mUserPower.get(userId);
-                    if (userPower == null) {
-                        userPower = power;
-                    } else {
-                        userPower += power;
-                    }
-                    mUserPower.put(userId, userPower);
-                } else {
-                    if (power > mMaxPower) mMaxPower = power;
-                    mTotalPower += power;
-                }
-            }
-        }
-
-        // The device has probably been awake for longer than the screen on
-        // time and application wake lock time would account for.  Assign
-        // this remainder to the OS, if possible.
-        if (osApp != null) {
-            long wakeTimeMillis = mStats.computeBatteryUptime(
-                    SystemClock.uptimeMillis() * 1000, which) / 1000;
-            wakeTimeMillis -= appWakelockTime + (mStats.getScreenOnTime(
-                    SystemClock.elapsedRealtime(), which) / 1000);
-            if (wakeTimeMillis > 0) {
-                double power = (wakeTimeMillis
-                        * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000;
-                if (DEBUG) Log.i(TAG, "OS wakeLockTime " + wakeTimeMillis + " power " + power);
-                osApp.wakeLockTime += wakeTimeMillis;
-                osApp.value += power;
-                osApp.values[0] += power;
-                if (osApp.value > mMaxPower) mMaxPower = osApp.value;
-                mTotalPower += power;
-            }
-        }
-    }
-
-    private void addPhoneUsage(long uSecNow) {
-        long phoneOnTimeMs = mStats.getPhoneOnTime(uSecNow, mStatsType) / 1000;
-        double phoneOnPower = mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ACTIVE)
-                * phoneOnTimeMs / 1000;
-        addEntry(getActivity().getString(R.string.power_phone), DrainType.PHONE, phoneOnTimeMs,
-                R.drawable.ic_settings_voice_calls, phoneOnPower);
-    }
-
-    private void addScreenUsage(long uSecNow) {
-        double power = 0;
-        long screenOnTimeMs = mStats.getScreenOnTime(uSecNow, mStatsType) / 1000;
-        power += screenOnTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_SCREEN_ON);
-        final double screenFullPower =
-                mPowerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL);
-        for (int i = 0; i < BatteryStats.NUM_SCREEN_BRIGHTNESS_BINS; i++) {
-            double screenBinPower = screenFullPower * (i + 0.5f)
-                    / BatteryStats.NUM_SCREEN_BRIGHTNESS_BINS;
-            long brightnessTime = mStats.getScreenBrightnessTime(i, uSecNow, mStatsType) / 1000;
-            power += screenBinPower * brightnessTime;
-            if (DEBUG) {
-                Log.i(TAG, "Screen bin power = " + (int) screenBinPower + ", time = "
-                        + brightnessTime);
-            }
-        }
-        power /= 1000; // To seconds
-        addEntry(getActivity().getString(R.string.power_screen), DrainType.SCREEN, screenOnTimeMs,
-                R.drawable.ic_settings_display, power);
-    }
-
-    private void addRadioUsage(long uSecNow) {
-        double power = 0;
-        final int BINS = SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
-        long signalTimeMs = 0;
-        for (int i = 0; i < BINS; i++) {
-            long strengthTimeMs = mStats.getPhoneSignalStrengthTime(i, uSecNow, mStatsType) / 1000;
-            power += strengthTimeMs / 1000
-                    * mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ON, i);
-            signalTimeMs += strengthTimeMs;
-        }
-        long scanningTimeMs = mStats.getPhoneSignalScanningTime(uSecNow, mStatsType) / 1000;
-        power += scanningTimeMs / 1000 * mPowerProfile.getAveragePower(
-                PowerProfile.POWER_RADIO_SCANNING);
-        BatterySipper bs =
-                addEntry(getActivity().getString(R.string.power_cell), DrainType.CELL,
-                        signalTimeMs, R.drawable.ic_settings_cell_standby, power);
-        if (signalTimeMs != 0) {
-            bs.noCoveragePercent = mStats.getPhoneSignalStrengthTime(0, uSecNow, mStatsType)
-                    / 1000 * 100.0 / signalTimeMs;
-        }
-    }
-
-    private void aggregateSippers(BatterySipper bs, List<BatterySipper> from, String tag) {
-        for (int i=0; i<from.size(); i++) {
-            BatterySipper wbs = from.get(i);
-            if (DEBUG) Log.i(TAG, tag + " adding sipper " + wbs + ": cpu=" + wbs.cpuTime);
-            bs.cpuTime += wbs.cpuTime;
-            bs.gpsTime += wbs.gpsTime;
-            bs.wifiRunningTime += wbs.wifiRunningTime;
-            bs.cpuFgTime += wbs.cpuFgTime;
-            bs.wakeLockTime += wbs.wakeLockTime;
-            bs.tcpBytesReceived += wbs.tcpBytesReceived;
-            bs.tcpBytesSent += wbs.tcpBytesSent;
-        }
-    }
-
-    private void addWiFiUsage(long uSecNow) {
-        long onTimeMs = mStats.getWifiOnTime(uSecNow, mStatsType) / 1000;
-        long runningTimeMs = mStats.getGlobalWifiRunningTime(uSecNow, mStatsType) / 1000;
-        if (DEBUG) Log.i(TAG, "WIFI runningTime=" + runningTimeMs
-                + " app runningTime=" + mAppWifiRunning);
-        runningTimeMs -= mAppWifiRunning;
-        if (runningTimeMs < 0) runningTimeMs = 0;
-        double wifiPower = (onTimeMs * 0 /* TODO */
-                * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)
-            + runningTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)) / 1000;
-        if (DEBUG) Log.i(TAG, "WIFI power=" + wifiPower + " from procs=" + mWifiPower);
-        BatterySipper bs = addEntry(getActivity().getString(R.string.power_wifi), DrainType.WIFI,
-                runningTimeMs, R.drawable.ic_settings_wifi, wifiPower + mWifiPower);
-        aggregateSippers(bs, mWifiSippers, "WIFI");
-    }
-
-    private void addIdleUsage(long uSecNow) {
-        long idleTimeMs = (uSecNow - mStats.getScreenOnTime(uSecNow, mStatsType)) / 1000;
-        double idlePower = (idleTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_IDLE))
-                / 1000;
-        addEntry(getActivity().getString(R.string.power_idle), DrainType.IDLE, idleTimeMs,
-                R.drawable.ic_settings_phone_idle, idlePower);
-    }
-
-    private void addBluetoothUsage(long uSecNow) {
-        long btOnTimeMs = mStats.getBluetoothOnTime(uSecNow, mStatsType) / 1000;
-        double btPower = btOnTimeMs * mPowerProfile.getAveragePower(PowerProfile.POWER_BLUETOOTH_ON)
-                / 1000;
-        int btPingCount = mStats.getBluetoothPingCount();
-        btPower += (btPingCount
-                * mPowerProfile.getAveragePower(PowerProfile.POWER_BLUETOOTH_AT_CMD)) / 1000;
-        BatterySipper bs = addEntry(getActivity().getString(R.string.power_bluetooth),
-                DrainType.BLUETOOTH, btOnTimeMs, R.drawable.ic_settings_bluetooth,
-                btPower + mBluetoothPower);
-        aggregateSippers(bs, mBluetoothSippers, "Bluetooth");
-    }
-
-    private 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
-        final double WIFI_POWER = mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ACTIVE)
-                / 3600;
-        final double MOBILE_POWER = mPowerProfile.getAveragePower(PowerProfile.POWER_RADIO_ACTIVE)
-                / 3600;
-        final long mobileData = mStats.getMobileTcpBytesReceived(mStatsType) +
-                mStats.getMobileTcpBytesSent(mStatsType);
-        final long wifiData = mStats.getTotalTcpBytesReceived(mStatsType) +
-                mStats.getTotalTcpBytesSent(mStatsType) - mobileData;
-        final long radioDataUptimeMs = mStats.getRadioDataUptime() / 1000;
-        final long mobileBps = radioDataUptimeMs != 0
-                ? mobileData * 8 * 1000 / radioDataUptimeMs
-                : MOBILE_BPS;
-
-        double mobileCostPerByte = MOBILE_POWER / (mobileBps / 8);
-        double wifiCostPerByte = WIFI_POWER / (WIFI_BPS / 8);
-        if (wifiData + mobileData != 0) {
-            return (mobileCostPerByte * mobileData + wifiCostPerByte * wifiData)
-                    / (mobileData + wifiData);
-        } else {
-            return 0;
-        }
-    }
-
-    private void processMiscUsage() {
-        final int which = mStatsType;
-        long uSecTime = SystemClock.elapsedRealtime() * 1000;
-        final long uSecNow = mStats.computeBatteryRealtime(uSecTime, which);
-        final long timeSinceUnplugged = uSecNow;
-        if (DEBUG) {
-            Log.i(TAG, "Uptime since last unplugged = " + (timeSinceUnplugged / 1000));
-        }
-
-        addUserUsage();
-        addPhoneUsage(uSecNow);
-        addScreenUsage(uSecNow);
-        addWiFiUsage(uSecNow);
-        addBluetoothUsage(uSecNow);
-        addIdleUsage(uSecNow); // Not including cellular idle power
-        // Don't compute radio usage if it's a wifi-only device
-        if (!com.android.settings.Utils.isWifiOnly(getActivity())) {
-            addRadioUsage(uSecNow);
-        }
-    }
-
-    private BatterySipper addEntry(String label, DrainType drainType, long time, int iconId,
-            double power) {
-        if (power > mMaxPower) mMaxPower = power;
-        mTotalPower += power;
-        BatterySipper bs = new BatterySipper(getActivity(), mRequestQueue, mHandler,
-                label, drainType, iconId, null, new double[] {power});
-        bs.usageTime = time;
-        bs.iconId = iconId;
-        mUsageList.add(bs);
-        return bs;
-    }
-
-    private void load() {
-        try {
-            byte[] data = mBatteryInfo.getStatistics();
-            Parcel parcel = Parcel.obtain();
-            parcel.unmarshall(data, 0, data.length);
-            parcel.setDataPosition(0);
-            mStats = com.android.internal.os.BatteryStatsImpl.CREATOR
-                    .createFromParcel(parcel);
-            mStats.distributeWorkLocked(BatteryStats.STATS_SINCE_CHARGED);
-        } catch (RemoteException e) {
-            Log.e(TAG, "RemoteException:", e);
-        }
-    }
-
-    public void run() {
-        while (true) {
-            BatterySipper bs;
-            synchronized (mRequestQueue) {
-                if (mRequestQueue.isEmpty() || mAbort) {
-                    mRequestThread = null;
-                    return;
-                }
-                bs = mRequestQueue.remove(0);
-            }
-            bs.getNameIcon();
-        }
-    }
-
-    static final int MSG_UPDATE_NAME_ICON = 1;
-
     Handler mHandler = new Handler() {
 
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
-                case MSG_UPDATE_NAME_ICON:
+                case BatteryStatsHelper.MSG_UPDATE_NAME_ICON:
                     BatterySipper bs = (BatterySipper) msg.obj;
-                    PowerGaugePreference pgp = 
+                    PowerGaugePreference pgp =
                             (PowerGaugePreference) findPreference(
                                     Integer.toString(bs.uidObj.getUid()));
                     if (pgp != null) {
@@ -898,6 +248,12 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
                         pgp.setTitle(bs.name);
                     }
                     break;
+                case BatteryStatsHelper.MSG_REPORT_FULLY_DRAWN:
+                    Activity activity = getActivity();
+                    if (activity != null) {
+                        activity.reportFullyDrawn();
+                    }
+                    break;
             }
             super.handleMessage(msg);
         }
diff --git a/src/com/android/settings/fuelgauge/Utils.java b/src/com/android/settings/fuelgauge/Utils.java
index 5c99a86d643..1ff358ea1b2 100644
--- a/src/com/android/settings/fuelgauge/Utils.java
+++ b/src/com/android/settings/fuelgauge/Utils.java
@@ -35,9 +35,13 @@ public class Utils {
      * @param millis the elapsed time in milli seconds
      * @return the formatted elapsed time
      */
-    public static String formatElapsedTime(Context context, double millis) {
+    public static String formatElapsedTime(Context context, double millis, boolean inclSeconds) {
         StringBuilder sb = new StringBuilder();
         int seconds = (int) Math.floor(millis / 1000);
+        if (!inclSeconds) {
+            // Round up.
+            seconds += 30;
+        }
 
         int days = 0, hours = 0, minutes = 0;
         if (seconds > SECONDS_PER_DAY) {
@@ -52,15 +56,28 @@ public class Utils {
             minutes = seconds / SECONDS_PER_MINUTE;
             seconds -= minutes * SECONDS_PER_MINUTE;
         }
-        if (days > 0) {
-            sb.append(context.getString(R.string.battery_history_days,
-                    days, hours, minutes, seconds));
-        } else if (hours > 0) {
-            sb.append(context.getString(R.string.battery_history_hours, hours, minutes, seconds));
-        } else if (minutes > 0) {
-            sb.append(context.getString(R.string.battery_history_minutes, minutes, seconds));
+        if (inclSeconds) {
+            if (days > 0) {
+                sb.append(context.getString(R.string.battery_history_days,
+                        days, hours, minutes, seconds));
+            } else if (hours > 0) {
+                sb.append(context.getString(R.string.battery_history_hours,
+                        hours, minutes, seconds));
+            } else if (minutes > 0) {
+                sb.append(context.getString(R.string.battery_history_minutes, minutes, seconds));
+            } else {
+                sb.append(context.getString(R.string.battery_history_seconds, seconds));
+            }
         } else {
-            sb.append(context.getString(R.string.battery_history_seconds, seconds));
+            if (days > 0) {
+                sb.append(context.getString(R.string.battery_history_days_no_seconds,
+                        days, hours, minutes));
+            } else if (hours > 0) {
+                sb.append(context.getString(R.string.battery_history_hours_no_seconds,
+                        hours, minutes));
+            } else {
+                sb.append(context.getString(R.string.battery_history_minutes_no_seconds, minutes));
+            }
         }
         return sb.toString();
     }
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index 2a5adb1d0c9..a2700cfc44e 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -20,10 +20,12 @@ import com.android.settings.R;
 import com.android.settings.Settings.KeyboardLayoutPickerActivity;
 import com.android.settings.Settings.SpellCheckersSettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.UserDictionarySettings;
 import com.android.settings.Utils;
 import com.android.settings.VoiceInputOutputSettings;
 
 import android.app.Activity;
+import android.app.Fragment;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -38,6 +40,8 @@ import android.os.Handler;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
@@ -46,6 +50,7 @@ import android.text.TextUtils;
 import android.view.InputDevice;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.BaseAdapter;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -83,12 +88,23 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
             new ArrayList<PreferenceScreen>();
     private InputManager mIm;
     private InputMethodManager mImm;
-    private List<InputMethodInfo> mImis;
     private boolean mIsOnlyImeSettings;
     private Handler mHandler;
-    @SuppressWarnings("unused")
     private SettingsObserver mSettingsObserver;
     private Intent mIntentWaitingForResult;
+    private InputMethodSettingValuesWrapper mInputMethodSettingValues;
+
+    private final OnPreferenceChangeListener mOnImePreferenceChangedListener =
+            new OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference arg0, Object arg1) {
+                    InputMethodSettingValuesWrapper.getInstance(
+                            arg0.getContext()).refreshAllInputMethodAndSubtypes();
+                    ((BaseAdapter)getPreferenceScreen().getRootAdapter()).notifyDataSetChanged();
+                    updateInputMethodPreferenceViews();
+                    return true;
+                }
+            };
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -140,7 +156,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
 
         // Build IME preference category.
         mImm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        mImis = mImm.getInputMethodList();
+        mInputMethodSettingValues = InputMethodSettingValuesWrapper.getInstance(getActivity());
 
         mKeyboardSettingsCategory.removeAll();
         if (!mIsOnlyImeSettings) {
@@ -150,18 +166,22 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
             mKeyboardSettingsCategory.addPreference(currentIme);
         }
 
-        mInputMethodPreferenceList.clear();
-        final int N = (mImis == null ? 0 : mImis.size());
-        for (int i = 0; i < N; ++i) {
-            final InputMethodInfo imi = mImis.get(i);
-            final InputMethodPreference pref = getInputMethodPreference(imi, N);
-            mInputMethodPreferenceList.add(pref);
-        }
-
-        if (!mInputMethodPreferenceList.isEmpty()) {
-            Collections.sort(mInputMethodPreferenceList);
+        synchronized (mInputMethodPreferenceList) {
+            mInputMethodPreferenceList.clear();
+            final List<InputMethodInfo> imis = mInputMethodSettingValues.getInputMethodList();
+            final int N = (imis == null ? 0 : imis.size());
             for (int i = 0; i < N; ++i) {
-                mKeyboardSettingsCategory.addPreference(mInputMethodPreferenceList.get(i));
+                final InputMethodInfo imi = imis.get(i);
+                final InputMethodPreference pref = getInputMethodPreference(imi);
+                pref.setOnImePreferenceChangeListener(mOnImePreferenceChangedListener);
+                mInputMethodPreferenceList.add(pref);
+            }
+
+            if (!mInputMethodPreferenceList.isEmpty()) {
+                Collections.sort(mInputMethodPreferenceList);
+                for (int i = 0; i < N; ++i) {
+                    mKeyboardSettingsCategory.addPreference(mInputMethodPreferenceList.get(i));
+                }
             }
         }
 
@@ -193,31 +213,41 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
 
     private void updateUserDictionaryPreference(Preference userDictionaryPreference) {
         final Activity activity = getActivity();
-        final TreeSet<String> localeList = UserDictionaryList.getUserDictionaryLocalesSet(activity);
-        if (null == localeList) {
+        final TreeSet<String> localeSet = UserDictionaryList.getUserDictionaryLocalesSet(activity);
+        if (null == localeSet) {
             // The locale list is null if and only if the user dictionary service is
             // not present or disabled. In this case we need to remove the preference.
             getPreferenceScreen().removePreference(userDictionaryPreference);
-        } else if (localeList.size() <= 1) {
-            final Intent intent =
-                    new Intent(UserDictionaryList.USER_DICTIONARY_SETTINGS_INTENT_ACTION);
-            userDictionaryPreference.setTitle(R.string.user_dict_single_settings_title);
-            userDictionaryPreference.setIntent(intent);
-            userDictionaryPreference.setFragment(
-                    com.android.settings.UserDictionarySettings.class.getName());
-            // If the size of localeList is 0, we don't set the locale parameter in the
-            // extras. This will be interpreted by the UserDictionarySettings class as
-            // meaning "the current locale".
-            // Note that with the current code for UserDictionaryList#getUserDictionaryLocalesSet()
-            // the locale list always has at least one element, since it always includes the current
-            // locale explicitly. @see UserDictionaryList.getUserDictionaryLocalesSet().
-            if (localeList.size() == 1) {
-                final String locale = (String)localeList.toArray()[0];
-                userDictionaryPreference.getExtras().putString("locale", locale);
-            }
         } else {
-            userDictionaryPreference.setTitle(R.string.user_dict_multiple_settings_title);
-            userDictionaryPreference.setFragment(UserDictionaryList.class.getName());
+            userDictionaryPreference.setOnPreferenceClickListener(
+                    new OnPreferenceClickListener() {
+                        @Override
+                        public boolean onPreferenceClick(Preference arg0) {
+                            // Redirect to UserDictionarySettings if the user needs only one
+                            // language.
+                            final Bundle extras = new Bundle();
+                            final Class<? extends Fragment> targetFragment;
+                            if (localeSet.size() <= 1) {
+                                if (!localeSet.isEmpty()) {
+                                    // If the size of localeList is 0, we don't set the locale
+                                    // parameter in the extras. This will be interpreted by the
+                                    // UserDictionarySettings class as meaning
+                                    // "the current locale". Note that with the current code for
+                                    // UserDictionaryList#getUserDictionaryLocalesSet()
+                                    // the locale list always has at least one element, since it
+                                    // always includes the current locale explicitly.
+                                    // @see UserDictionaryList.getUserDictionaryLocalesSet().
+                                    extras.putString("locale", localeSet.first());
+                                }
+                                targetFragment = UserDictionarySettings.class;
+                            } else {
+                                targetFragment = UserDictionaryList.class;
+                            }
+                            startFragment(InputMethodAndLanguageSettings.this,
+                                    targetFragment.getCanonicalName(), -1, extras);
+                            return true;
+                        }
+                    });
         }
     }
 
@@ -278,10 +308,14 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
 
         updateInputDevices();
 
-        // IME
+        // Refresh internal states in mInputMethodSettingValues to keep the latest
+        // "InputMethodInfo"s and "InputMethodSubtype"s
+        mInputMethodSettingValues.refreshAllInputMethodAndSubtypes();
+        // TODO: Consolidate the logic to InputMethodSettingsWrapper
         InputMethodAndSubtypeUtil.loadInputMethodSubtypeList(
-                this, getContentResolver(), mImis, null);
-        updateActiveInputMethodsSummary();
+                this, getContentResolver(),
+                mInputMethodSettingValues.getInputMethodList(), null);
+        updateInputMethodPreferenceViews();
     }
 
     @Override
@@ -294,8 +328,10 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
         if (SHOW_INPUT_METHOD_SWITCHER_SETTINGS) {
             mShowInputMethodSelectorPref.setOnPreferenceChangeListener(null);
         }
+        // TODO: Consolidate the logic to InputMethodSettingsWrapper
         InputMethodAndSubtypeUtil.saveInputMethodSubtypeList(
-                this, getContentResolver(), mImis, !mHardKeyboardPreferenceList.isEmpty());
+                this, getContentResolver(), mInputMethodSettingValues.getInputMethodList(),
+                !mHardKeyboardPreferenceList.isEmpty());
     }
 
     @Override
@@ -389,10 +425,12 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
         return false;
     }
 
-    private void updateActiveInputMethodsSummary() {
-        for (Preference pref : mInputMethodPreferenceList) {
-            if (pref instanceof InputMethodPreference) {
-                ((InputMethodPreference)pref).updateSummary();
+    private void updateInputMethodPreferenceViews() {
+        synchronized (mInputMethodPreferenceList) {
+            for (Preference pref : mInputMethodPreferenceList) {
+                if (pref instanceof InputMethodPreference) {
+                    ((InputMethodPreference) pref).updatePreferenceViews();
+                }
             }
         }
         updateCurrentImeName();
@@ -403,8 +441,8 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
         if (context == null || mImm == null) return;
         final Preference curPref = getPreferenceScreen().findPreference(KEY_CURRENT_INPUT_METHOD);
         if (curPref != null) {
-            final CharSequence curIme = InputMethodAndSubtypeUtil.getCurrentInputMethodName(
-                    context, getContentResolver(), mImm, mImis, getPackageManager());
+            final CharSequence curIme =
+                    mInputMethodSettingValues.getCurrentInputMethodName(context);
             if (!TextUtils.isEmpty(curIme)) {
                 synchronized(this) {
                     curPref.setSummary(curIme);
@@ -413,7 +451,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
         }
     }
 
-    private InputMethodPreference getInputMethodPreference(InputMethodInfo imi, int imiSize) {
+    private InputMethodPreference getInputMethodPreference(InputMethodInfo imi) {
         final PackageManager pm = getPackageManager();
         final CharSequence label = imi.loadLabel(pm);
         // IME settings
@@ -427,7 +465,8 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
         }
 
         // Add a check box for enabling/disabling IME
-        InputMethodPreference pref = new InputMethodPreference(this, intent, mImm, imi, imiSize);
+        final InputMethodPreference pref =
+                new InputMethodPreference(this, intent, mImm, imi);
         pref.setKey(imi.getId());
         pref.setTitle(label);
         return pref;
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
index f3addf367cf..419a8774996 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.inputmethod;
 
+import com.android.internal.inputmethod.InputMethodUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
@@ -106,6 +107,10 @@ public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment {
     @Override
     public void onResume() {
         super.onResume();
+        // Refresh internal states in mInputMethodSettingValues to keep the latest
+        // "InputMethodInfo"s and "InputMethodSubtype"s
+        InputMethodSettingValuesWrapper
+                .getInstance(getActivity()).refreshAllInputMethodAndSubtypes();
         InputMethodAndSubtypeUtil.loadInputMethodSubtypeList(
                 this, getContentResolver(), mInputMethodProperties, mInputMethodAndSubtypePrefsMap);
         updateAutoSelectionCB();
@@ -145,7 +150,7 @@ public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment {
                     InputMethodInfo imi = mInputMethodProperties.get(i);
                     if (id.equals(imi.getId())) {
                         selImi = imi;
-                        if (InputMethodAndSubtypeUtil.isSystemIme(imi)) {
+                        if (InputMethodUtils.isSystemIme(imi)) {
                             InputMethodAndSubtypeUtil.setSubtypesPreferenceEnabled(
                                     this, mInputMethodProperties, id, true);
                             // This is a built-in IME, so no need to warn.
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerActivity.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerActivity.java
index d70d5e44192..5693e209ed2 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerActivity.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerActivity.java
@@ -15,9 +15,12 @@
  */
 package com.android.settings.inputmethod;
 
+import android.app.Fragment;
 import android.content.Intent;
 import android.preference.PreferenceActivity;
 
+import com.android.settings.ChooseLockPassword.ChooseLockPasswordFragment;
+
 public class InputMethodAndSubtypeEnablerActivity extends PreferenceActivity {
     @Override
     public Intent getIntent() {
@@ -28,4 +31,11 @@ public class InputMethodAndSubtypeEnablerActivity extends PreferenceActivity {
         }
         return modIntent;
     }
+
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (InputMethodAndSubtypeEnabler.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
+
 }
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
index c7d8c8941a3..561302ab35a 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
@@ -16,13 +16,10 @@
 
 package com.android.settings.inputmethod;
 
+import com.android.internal.inputmethod.InputMethodUtils;
 import com.android.settings.SettingsPreferenceFragment;
 
 import android.content.ContentResolver;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
@@ -31,13 +28,11 @@ import android.provider.Settings.SettingNotFoundException;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.InputMethodSubtype;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
 public class InputMethodAndSubtypeUtil {
@@ -48,7 +43,6 @@ public class InputMethodAndSubtypeUtil {
     private static final char INPUT_METHOD_SEPARATER = ':';
     private static final char INPUT_METHOD_SUBTYPE_SEPARATER = ';';
     private static final int NOT_A_SUBTYPE_ID = -1;
-    private static final Locale ENGLISH_LOCALE = new Locale("en");
 
     private static final TextUtils.SimpleStringSplitter sStringInputMethodSplitter
             = new TextUtils.SimpleStringSplitter(INPUT_METHOD_SEPARATER);
@@ -154,28 +148,6 @@ public class InputMethodAndSubtypeUtil {
         return set;
     }
 
-    public static CharSequence getCurrentInputMethodName(Context context, ContentResolver resolver,
-            InputMethodManager imm, List<InputMethodInfo> imis, PackageManager pm) {
-        if (resolver == null || imis == null) return null;
-        final String currentInputMethodId = Settings.Secure.getString(resolver,
-                Settings.Secure.DEFAULT_INPUT_METHOD);
-        if (TextUtils.isEmpty(currentInputMethodId)) return null;
-        for (InputMethodInfo imi : imis) {
-            if (currentInputMethodId.equals(imi.getId())) {
-                final InputMethodSubtype subtype = imm.getCurrentInputMethodSubtype();
-                final CharSequence imiLabel = imi.loadLabel(pm);
-                final CharSequence summary = subtype != null
-                        ? TextUtils.concat(subtype.getDisplayName(context,
-                                    imi.getPackageName(), imi.getServiceInfo().applicationInfo),
-                                            (TextUtils.isEmpty(imiLabel) ?
-                                                    "" : " - " + imiLabel))
-                        : imiLabel;
-                return summary;
-            }
-        }
-        return null;
-    }
-
     public static void saveInputMethodSubtypeList(SettingsPreferenceFragment context,
             ContentResolver resolver, List<InputMethodInfo> inputMethodInfos,
             boolean hasHardKeyboard) {
@@ -198,8 +170,9 @@ public class InputMethodAndSubtypeUtil {
                     ((CheckBoxPreference) pref).isChecked()
                     : enabledIMEAndSubtypesMap.containsKey(imiId);
             final boolean isCurrentInputMethod = imiId.equals(currentInputMethodId);
-            final boolean systemIme = isSystemIme(imi);
-            if ((!hasHardKeyboard && isAlwaysCheckedIme(imi, context.getActivity(), imiCount))
+            final boolean systemIme = InputMethodUtils.isSystemIme(imi);
+            if ((!hasHardKeyboard && InputMethodSettingValuesWrapper.getInstance(
+                    context.getActivity()).isAlwaysCheckedIme(imi, context.getActivity()))
                     || isImeChecked) {
                 if (!enabledIMEAndSubtypesMap.containsKey(imiId)) {
                     // imiId has just been enabled
@@ -367,56 +340,4 @@ public class InputMethodAndSubtypeUtil {
             }
         }
     }
-
-    public static boolean isSystemIme(InputMethodInfo property) {
-        return (property.getServiceInfo().applicationInfo.flags
-                & ApplicationInfo.FLAG_SYSTEM) != 0;
-    }
-
-    public static boolean isAuxiliaryIme(InputMethodInfo imi) {
-        return imi.isAuxiliaryIme();
-    }
-
-    public static boolean isAlwaysCheckedIme(InputMethodInfo imi, Context context, int imiCount) {
-        if (imiCount <= 1) {
-            return true;
-        }
-        if (!isSystemIme(imi)) {
-            return false;
-        }
-        if (isAuxiliaryIme(imi)) {
-            return false;
-        }
-        if (isValidDefaultIme(imi, context)) {
-            return true;
-        }
-        return containsSubtypeOf(imi, ENGLISH_LOCALE.getLanguage());
-    }
-
-    private static boolean isValidDefaultIme(InputMethodInfo imi, Context context) {
-        if (imi.getIsDefaultResourceId() != 0) {
-            try {
-                Resources res = context.createPackageContext(
-                        imi.getPackageName(), 0).getResources();
-                if (res.getBoolean(imi.getIsDefaultResourceId())
-                        && containsSubtypeOf(imi, context.getResources().getConfiguration().
-                                locale.getLanguage())) {
-                    return true;
-                }
-            } catch (PackageManager.NameNotFoundException ex) {
-            } catch (Resources.NotFoundException ex) {
-            }
-        }
-        return false;
-    }
-
-    private static boolean containsSubtypeOf(InputMethodInfo imi, String language) {
-        final int N = imi.getSubtypeCount();
-        for (int i = 0; i < N; ++i) {
-            if (imi.getSubtypeAt(i).getLocale().startsWith(language)) {
-                return true;
-            }
-        }
-        return false;
-    }
 }
diff --git a/src/com/android/settings/inputmethod/InputMethodPreference.java b/src/com/android/settings/inputmethod/InputMethodPreference.java
index 56b6e673850..aa6430fc903 100644
--- a/src/com/android/settings/inputmethod/InputMethodPreference.java
+++ b/src/com/android/settings/inputmethod/InputMethodPreference.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.inputmethod;
 
+import com.android.internal.inputmethod.InputMethodUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
@@ -23,6 +24,7 @@ import com.android.settings.Utils;
 import android.app.AlertDialog;
 import android.app.Fragment;
 import android.content.ActivityNotFoundException;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -44,7 +46,6 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import java.text.Collator;
-import java.util.Comparator;
 import java.util.List;
 
 public class InputMethodPreference extends CheckBoxPreference {
@@ -52,8 +53,8 @@ public class InputMethodPreference extends CheckBoxPreference {
     private final SettingsPreferenceFragment mFragment;
     private final InputMethodInfo mImi;
     private final InputMethodManager mImm;
+    private final boolean mIsValidSystemNonAuxAsciiCapableIme;
     private final Intent mSettingsIntent;
-    private final boolean mAlwaysChecked;
     private final boolean mIsSystemIme;
     private final Collator mCollator;
 
@@ -62,6 +63,7 @@ public class InputMethodPreference extends CheckBoxPreference {
     private TextView mTitleText;
     private TextView mSummaryText;
     private View mInputMethodPref;
+    private OnPreferenceChangeListener mOnImePreferenceChangeListener;
 
     private final OnClickListener mPrefOnclickListener = new OnClickListener() {
         @Override
@@ -82,7 +84,7 @@ public class InputMethodPreference extends CheckBoxPreference {
     };
 
     public InputMethodPreference(SettingsPreferenceFragment fragment, Intent settingsIntent,
-            InputMethodManager imm, InputMethodInfo imi, int imiCount) {
+            InputMethodManager imm, InputMethodInfo imi) {
         super(fragment.getActivity(), null, R.style.InputMethodPreferenceStyle);
         setLayoutResource(R.layout.preference_inputmethod);
         setWidgetLayoutResource(R.layout.preference_inputmethod_widget);
@@ -90,14 +92,12 @@ public class InputMethodPreference extends CheckBoxPreference {
         mSettingsIntent = settingsIntent;
         mImm = imm;
         mImi = imi;
-        updateSummary();
-        mAlwaysChecked = InputMethodAndSubtypeUtil.isAlwaysCheckedIme(
-                imi, fragment.getActivity(), imiCount);
-        mIsSystemIme = InputMethodAndSubtypeUtil.isSystemIme(imi);
-        if (mAlwaysChecked) {
-            setEnabled(false);
-        }
+        mIsSystemIme = InputMethodUtils.isSystemIme(imi);
         mCollator = Collator.getInstance(fragment.getResources().getConfiguration().locale);
+        final Context context = fragment.getActivity();
+        mIsValidSystemNonAuxAsciiCapableIme = InputMethodSettingValuesWrapper
+                .getInstance(context).isValidSystemNonAuxAsciiCapableIme(imi, context);
+        updatePreferenceViews();
     }
 
     @Override
@@ -157,9 +157,8 @@ public class InputMethodPreference extends CheckBoxPreference {
         }
         if (mSettingsIntent == null) {
             mInputMethodSettingsButton.setVisibility(View.GONE);
-        } else {
-            updatePreferenceViews();
         }
+        updatePreferenceViews();
     }
 
     @Override
@@ -168,7 +167,16 @@ public class InputMethodPreference extends CheckBoxPreference {
         updatePreferenceViews();
     }
 
-    private void updatePreferenceViews() {
+    public void updatePreferenceViews() {
+        final boolean isAlwaysChecked =
+                InputMethodSettingValuesWrapper.getInstance(getContext()).isAlwaysCheckedIme(
+                        mImi, getContext());
+        if (isAlwaysChecked) {
+            super.setChecked(true);
+            super.setEnabled(false);
+        } else {
+            super.setEnabled(true);
+        }
         final boolean checked = isChecked();
         if (mInputMethodSettingsButton != null) {
             mInputMethodSettingsButton.setEnabled(checked);
@@ -193,6 +201,7 @@ public class InputMethodPreference extends CheckBoxPreference {
                 mInputMethodPref.setBackgroundColor(0);
             }
         }
+        updateSummary();
     }
 
     public static boolean startFragment(
@@ -210,7 +219,7 @@ public class InputMethodPreference extends CheckBoxPreference {
         }
     }
 
-    public String getSummaryString() {
+    private String getSummaryString() {
         final StringBuilder builder = new StringBuilder();
         final List<InputMethodSubtype> subtypes = mImm.getEnabledInputMethodSubtypeList(mImi, true);
         for (InputMethodSubtype subtype : subtypes) {
@@ -224,7 +233,7 @@ public class InputMethodPreference extends CheckBoxPreference {
         return builder.toString();
     }
 
-    public void updateSummary() {
+    private void updateSummary() {
         final String summary = getSummaryString();
         if (TextUtils.isEmpty(summary)) {
             return;
@@ -237,17 +246,19 @@ public class InputMethodPreference extends CheckBoxPreference {
      * @param checked whether to check the box
      * @param save whether to save IME settings
      */
-    public void setChecked(boolean checked, boolean save) {
+    private void setChecked(boolean checked, boolean save) {
+        final boolean wasChecked = isChecked();
         super.setChecked(checked);
         if (save) {
             saveImeSettings();
+            if (wasChecked != checked && mOnImePreferenceChangeListener != null) {
+                mOnImePreferenceChangeListener.onPreferenceChange(this, checked);
+            }
         }
-        updateSummary();
     }
 
-    @Override
-    public void setChecked(boolean checked) {
-        setChecked(checked, false);
+    public void setOnImePreferenceChangeListener(OnPreferenceChangeListener listener) {
+        mOnImePreferenceChangeListener = listener;
     }
 
     private void showSecurityWarnDialog(InputMethodInfo imi, final InputMethodPreference chkPref) {
@@ -284,8 +295,8 @@ public class InputMethodPreference extends CheckBoxPreference {
             return super.compareTo(p);
         }
         final InputMethodPreference imp = (InputMethodPreference) p;
-        final boolean priority0 = mIsSystemIme && mAlwaysChecked;
-        final boolean priority1 = imp.mIsSystemIme && imp.mAlwaysChecked;
+        final boolean priority0 = mIsSystemIme && mIsValidSystemNonAuxAsciiCapableIme;
+        final boolean priority1 = imp.mIsSystemIme && imp.mIsValidSystemNonAuxAsciiCapableIme;
         if (priority0 == priority1) {
             final CharSequence t0 = getTitle();
             final CharSequence t1 = imp.getTitle();
diff --git a/src/com/android/settings/inputmethod/InputMethodSettingValuesWrapper.java b/src/com/android/settings/inputmethod/InputMethodSettingValuesWrapper.java
new file mode 100644
index 00000000000..ccba143a0d4
--- /dev/null
+++ b/src/com/android/settings/inputmethod/InputMethodSettingValuesWrapper.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import com.android.internal.inputmethod.InputMethodUtils;
+import com.android.internal.inputmethod.InputMethodUtils.InputMethodSettings;
+
+import android.app.ActivityManagerNative;
+import android.content.Context;
+import android.os.RemoteException;
+import android.util.Log;
+import android.util.Slog;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.InputMethodSubtype;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * This class is a wrapper for InputMethodSettings. You need to refresh internal states
+ * manually on some events when "InputMethodInfo"s and "InputMethodSubtype"s can be
+ * changed.
+ */
+public class InputMethodSettingValuesWrapper {
+    private static final String TAG = InputMethodSettingValuesWrapper.class.getSimpleName();
+    private static final Locale ENGLISH_LOCALE = new Locale("en");
+
+    private static volatile InputMethodSettingValuesWrapper sInstance;
+    private final ArrayList<InputMethodInfo> mMethodList = new ArrayList<InputMethodInfo>();
+    private final HashMap<String, InputMethodInfo> mMethodMap =
+            new HashMap<String, InputMethodInfo>();
+    private final InputMethodSettings mSettings;
+    private final InputMethodManager mImm;
+    private final HashSet<InputMethodInfo> mAsciiCapableEnabledImis =
+            new HashSet<InputMethodInfo>();
+
+    public static InputMethodSettingValuesWrapper getInstance(Context context) {
+        if (sInstance == null) {
+            synchronized(TAG) {
+                if (sInstance == null) {
+                    sInstance = new InputMethodSettingValuesWrapper(context);
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    private static int getDefaultCurrentUserId() {
+        try {
+            return ActivityManagerNative.getDefault().getCurrentUser().id;
+        } catch (RemoteException e) {
+            Slog.w(TAG, "Couldn't get current user ID; guessing it's 0", e);
+        }
+        return 0;
+    }
+
+    // Ensure singleton
+    private InputMethodSettingValuesWrapper(Context context) {
+        mSettings =
+                new InputMethodSettings(context.getResources(), context.getContentResolver(),
+                        mMethodMap, mMethodList, getDefaultCurrentUserId());
+        mImm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+        refreshAllInputMethodAndSubtypes();
+    }
+
+    public void refreshAllInputMethodAndSubtypes() {
+        synchronized (mMethodMap) {
+            mMethodList.clear();
+            mMethodMap.clear();
+            final List<InputMethodInfo> imms = mImm.getInputMethodList();
+            mMethodList.addAll(imms);
+            for (InputMethodInfo imi : imms) {
+                mMethodMap.put(imi.getId(), imi);
+            }
+            updateAsciiCapableEnabledImis();
+        }
+    }
+
+    // TODO: Add a cts to ensure at least one AsciiCapableSubtypeEnabledImis exist
+    private void updateAsciiCapableEnabledImis() {
+        synchronized (mMethodMap) {
+            mAsciiCapableEnabledImis.clear();
+            final List<InputMethodInfo> enabledImis = mSettings.getEnabledInputMethodListLocked();
+            for (final InputMethodInfo imi : enabledImis) {
+                final int subtypeCount = imi.getSubtypeCount();
+                for (int i = 0; i < subtypeCount; ++i) {
+                    final InputMethodSubtype subtype = imi.getSubtypeAt(i);
+                    if (InputMethodUtils.SUBTYPE_MODE_KEYBOARD.equalsIgnoreCase(subtype.getMode())
+                            && subtype.isAsciiCapable()) {
+                        mAsciiCapableEnabledImis.add(imi);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    public List<InputMethodInfo> getInputMethodList() {
+        synchronized (mMethodMap) {
+            return mMethodList;
+        }
+    }
+
+    public CharSequence getCurrentInputMethodName(Context context) {
+        synchronized (mMethodMap) {
+            final InputMethodInfo imi = mMethodMap.get(mSettings.getSelectedInputMethod());
+            if (imi == null) {
+                Log.w(TAG, "Invalid selected imi: " + mSettings.getSelectedInputMethod());
+                return "";
+            }
+            final InputMethodSubtype subtype = mImm.getCurrentInputMethodSubtype();
+            return InputMethodUtils.getImeAndSubtypeDisplayName(context, imi, subtype);
+        }
+    }
+
+    public boolean isAlwaysCheckedIme(InputMethodInfo imi, Context context) {
+        final boolean isEnabled = isEnabledImi(imi);
+        synchronized (mMethodMap) {
+            if (mSettings.getEnabledInputMethodListLocked().size() <= 1 && isEnabled) {
+                return true;
+            }
+        }
+
+        final int enabledValidSystemNonAuxAsciiCapableImeCount =
+                getEnabledValidSystemNonAuxAsciiCapableImeCount(context);
+        if (enabledValidSystemNonAuxAsciiCapableImeCount > 1) {
+            return false;
+        }
+
+        if (enabledValidSystemNonAuxAsciiCapableImeCount == 1 && !isEnabled) {
+            return false;
+        }
+
+        if (!InputMethodUtils.isSystemIme(imi)) {
+            return false;
+        }
+        return isValidSystemNonAuxAsciiCapableIme(imi, context);
+    }
+
+    private int getEnabledValidSystemNonAuxAsciiCapableImeCount(Context context) {
+        int count = 0;
+        final List<InputMethodInfo> enabledImis;
+        synchronized(mMethodMap) {
+            enabledImis = mSettings.getEnabledInputMethodListLocked();
+        }
+        for (final InputMethodInfo imi : enabledImis) {
+            if (isValidSystemNonAuxAsciiCapableIme(imi, context)) {
+                ++count;
+            }
+        }
+        if (count == 0) {
+            Log.w(TAG, "No \"enabledValidSystemNonAuxAsciiCapableIme\"s found.");
+        }
+        return count;
+    }
+
+    private boolean isEnabledImi(InputMethodInfo imi) {
+        final List<InputMethodInfo> enabledImis;
+        synchronized(mMethodMap) {
+            enabledImis = mSettings.getEnabledInputMethodListLocked();
+        }
+        for (final InputMethodInfo tempImi : enabledImis) {
+            if (tempImi.getId().equals(imi.getId())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean isValidSystemNonAuxAsciiCapableIme(InputMethodInfo imi,
+            Context context) {
+        if (imi.isAuxiliaryIme()) {
+            return false;
+        }
+        if (InputMethodUtils.isValidSystemDefaultIme(true /* isSystemReady */, imi, context)) {
+            return true;
+        }
+        if (mAsciiCapableEnabledImis.isEmpty()) {
+            Log.w(TAG, "ascii capable subtype enabled imi not found. Fall back to English"
+                    + " Keyboard subtype.");
+            return InputMethodUtils.containsSubtypeOf(imi, ENGLISH_LOCALE.getLanguage(),
+                    InputMethodUtils.SUBTYPE_MODE_KEYBOARD);
+        }
+        return mAsciiCapableEnabledImis.contains(imi);
+    }
+}
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
index 1bf68ce47ad..2901673cfe3 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
@@ -28,8 +28,6 @@ import android.view.View;
 
 public class UserDictionaryAddWordActivity extends Activity {
 
-    private static final String STATE_KEY_IS_OPEN = "isOpen";
-
     public static final String MODE_EDIT_ACTION = "com.android.settings.USER_DICTIONARY_EDIT";
     public static final String MODE_INSERT_ACTION = "com.android.settings.USER_DICTIONARY_INSERT";
 
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
index 3251216d3c2..d81703ea1c9 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
@@ -57,6 +57,8 @@ public class UserDictionaryAddWordContents {
     private String mLocale;
     private final String mOldWord;
     private final String mOldShortcut;
+    private String mSavedWord;
+    private String mSavedShortcut;
 
     /* package */ UserDictionaryAddWordContents(final View view, final Bundle args) {
         mWordEditText = (EditText)view.findViewById(R.id.user_dictionary_add_word_text);
@@ -64,7 +66,9 @@ public class UserDictionaryAddWordContents {
         final String word = args.getString(EXTRA_WORD);
         if (null != word) {
             mWordEditText.setText(word);
-            mWordEditText.setSelection(word.length());
+            // Use getText in case the edit text modified the text we set. This happens when
+            // it's too long to be edited.
+            mWordEditText.setSelection(mWordEditText.getText().length());
         }
         final String shortcut = args.getString(EXTRA_SHORTCUT);
         if (null != shortcut && null != mShortcutEditText) {
@@ -76,6 +80,16 @@ public class UserDictionaryAddWordContents {
         updateLocale(args.getString(EXTRA_LOCALE));
     }
 
+    /* package */ UserDictionaryAddWordContents(final View view,
+            final UserDictionaryAddWordContents oldInstanceToBeEdited) {
+        mWordEditText = (EditText)view.findViewById(R.id.user_dictionary_add_word_text);
+        mShortcutEditText = (EditText)view.findViewById(R.id.user_dictionary_add_shortcut);
+        mMode = MODE_EDIT;
+        mOldWord = oldInstanceToBeEdited.mSavedWord;
+        mOldShortcut = oldInstanceToBeEdited.mSavedShortcut;
+        updateLocale(mLocale);
+    }
+
     // locale may be null, this means default locale
     // It may also be the empty string, which means "all locales"
     /* package */ void updateLocale(final String locale) {
@@ -126,6 +140,8 @@ public class UserDictionaryAddWordContents {
             // If the word is somehow empty, don't insert it.
             return UserDictionaryAddWordActivity.CODE_CANCEL;
         }
+        mSavedWord = newWord;
+        mSavedShortcut = newShortcut;
         // If there is no shortcut, and the word already exists in the database, then we
         // should not insert, because either A. the word exists with no shortcut, in which
         // case the exact same thing we want to insert is already there, or B. the word
@@ -237,4 +253,8 @@ public class UserDictionaryAddWordContents {
         localesList.add(new LocaleRenderer(activity, null)); // meaning: select another locale
         return localesList;
     }
+
+    public String getCurrentUserDictionaryLocale() {
+        return mLocale;
+    }
 }
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
index e33333b56f8..86c3e79d88c 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordFragment.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.android.settings.inputmethod;
 
 import android.app.Fragment;
@@ -26,7 +27,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.Spinner;
 
 import com.android.settings.R;
 import com.android.settings.inputmethod.UserDictionaryAddWordContents.LocaleRenderer;
@@ -51,23 +51,39 @@ public class UserDictionaryAddWordFragment extends Fragment
     private boolean mIsDeleting = false;
 
     @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
+    public void onActivityCreated(final Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         setHasOptionsMenu(true);
+        getActivity().getActionBar().setTitle(R.string.user_dict_settings_title);
+        // Keep the instance so that we remember mContents when configuration changes (eg rotation)
+        setRetainInstance(true);
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
+    public View onCreateView(final LayoutInflater inflater, final ViewGroup container,
+            final Bundle savedState) {
         mRootView = inflater.inflate(R.layout.user_dictionary_add_word_fullscreen, null);
         mIsDeleting = false;
+        // If we have a non-null mContents object, it's the old value before a configuration
+        // change (eg rotation) so we need to use its values. Otherwise, read from the arguments.
         if (null == mContents) {
             mContents = new UserDictionaryAddWordContents(mRootView, getArguments());
+        } else {
+            // We create a new mContents object to account for the new situation : a word has
+            // been added to the user dictionary when we started rotating, and we are now editing
+            // it. That means in particular if the word undergoes any change, the old version should
+            // be updated, so the mContents object needs to switch to EDIT mode if it was in
+            // INSERT mode.
+            mContents = new UserDictionaryAddWordContents(mRootView,
+                    mContents /* oldInstanceToBeEdited */);
         }
+        getActivity().getActionBar().setSubtitle(UserDictionarySettingsUtils.getLocaleDisplayName(
+                getActivity(), mContents.getCurrentUserDictionaryLocale()));
         return mRootView;
     }
 
     @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+    public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
         MenuItem actionItem = menu.add(0, OPTIONS_MENU_DELETE, 0, R.string.delete)
                 .setIcon(android.R.drawable.ic_menu_delete);
         actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
@@ -102,13 +118,9 @@ public class UserDictionaryAddWordFragment extends Fragment
     private void updateSpinner() {
         final ArrayList<LocaleRenderer> localesList = mContents.getLocalesList(getActivity());
 
-        final Spinner localeSpinner =
-                (Spinner)mRootView.findViewById(R.id.user_dictionary_add_locale);
         final ArrayAdapter<LocaleRenderer> adapter = new ArrayAdapter<LocaleRenderer>(getActivity(),
                 android.R.layout.simple_spinner_item, localesList);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        localeSpinner.setAdapter(adapter);
-        localeSpinner.setOnItemSelectedListener(this);
     }
 
     @Override
diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java
index 5390be602ef..24acb4aea8f 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryList.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryList.java
@@ -21,45 +21,104 @@ import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
 import android.provider.UserDictionary;
+import android.text.TextUtils;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.InputMethodSubtype;
 
+import java.util.List;
 import java.util.Locale;
 import java.util.TreeSet;
 
 public class UserDictionaryList extends SettingsPreferenceFragment {
-
     public static final String USER_DICTIONARY_SETTINGS_INTENT_ACTION =
             "android.settings.USER_DICTIONARY_SETTINGS";
+    private String mLocale;
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getActivity()));
+        getActivity().getActionBar().setTitle(R.string.user_dict_settings_title);
     }
 
-    static TreeSet<String> getUserDictionaryLocalesSet(Activity activity) {
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        final Intent intent = getActivity().getIntent();
+        final String localeFromIntent =
+                null == intent ? null : intent.getStringExtra("locale");
+
+        final Bundle arguments = getArguments();
+        final String localeFromArguments =
+                null == arguments ? null : arguments.getString("locale");
+
+        final String locale;
+        if (null != localeFromArguments) {
+            locale = localeFromArguments;
+        } else if (null != localeFromIntent) {
+            locale = localeFromIntent;
+        } else {
+            locale = null;
+        }
+        mLocale = locale;
+    }
+
+    public static TreeSet<String> getUserDictionaryLocalesSet(Activity activity) {
         @SuppressWarnings("deprecation")
         final Cursor cursor = activity.managedQuery(UserDictionary.Words.CONTENT_URI,
                 new String[] { UserDictionary.Words.LOCALE },
                 null, null, null);
-        final TreeSet<String> localeList = new TreeSet<String>();
+        final TreeSet<String> localeSet = new TreeSet<String>();
         if (null == cursor) {
             // The user dictionary service is not present or disabled. Return null.
             return null;
         } else if (cursor.moveToFirst()) {
             final int columnIndex = cursor.getColumnIndex(UserDictionary.Words.LOCALE);
             do {
-                String locale = cursor.getString(columnIndex);
-                localeList.add(null != locale ? locale : "");
+                final String locale = cursor.getString(columnIndex);
+                localeSet.add(null != locale ? locale : "");
             } while (cursor.moveToNext());
         }
-        localeList.add(Locale.getDefault().toString());
-        return localeList;
+        // CAVEAT: Keep this for consistency of the implementation between Keyboard and Settings
+        // if (!UserDictionarySettings.IS_SHORTCUT_API_SUPPORTED) {
+        //     // For ICS, we need to show "For all languages" in case that the keyboard locale
+        //     // is different from the system locale
+        //     localeSet.add("");
+        // }
+
+        final InputMethodManager imm =
+                (InputMethodManager)activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+        final List<InputMethodInfo> imis = imm.getEnabledInputMethodList();
+        for (final InputMethodInfo imi : imis) {
+            final List<InputMethodSubtype> subtypes =
+                    imm.getEnabledInputMethodSubtypeList(
+                            imi, true /* allowsImplicitlySelectedSubtypes */);
+            for (InputMethodSubtype subtype : subtypes) {
+                final String locale = subtype.getLocale();
+                if (!TextUtils.isEmpty(locale)) {
+                    localeSet.add(locale);
+                }
+            }
+        }
+
+        // We come here after we have collected locales from existing user dictionary entries and
+        // enabled subtypes. If we already have the locale-without-country version of the system
+        // locale, we don't add the system locale to avoid confusion even though it's technically
+        // correct to add it.
+        if (!localeSet.contains(Locale.getDefault().getLanguage().toString())) {
+            localeSet.add(Locale.getDefault().toString());
+        }
+
+        return localeSet;
     }
 
     /**
@@ -69,13 +128,23 @@ public class UserDictionaryList extends SettingsPreferenceFragment {
     protected void createUserDictSettings(PreferenceGroup userDictGroup) {
         final Activity activity = getActivity();
         userDictGroup.removeAll();
-        final TreeSet<String> localeList =
+        final TreeSet<String> localeSet =
                 UserDictionaryList.getUserDictionaryLocalesSet(activity);
+        if (mLocale != null) {
+            // If the caller explicitly specify empty string as a locale, we'll show "all languages"
+            // in the list.
+            localeSet.add(mLocale);
+        }
+        if (localeSet.size() > 1) {
+            // Have an "All languages" entry in the languages list if there are two or more active
+            // languages
+            localeSet.add("");
+        }
 
-        if (localeList.isEmpty()) {
+        if (localeSet.isEmpty()) {
             userDictGroup.addPreference(createUserDictionaryPreference(null, activity));
         } else {
-            for (String locale : localeList) {
+            for (String locale : localeSet) {
                 userDictGroup.addPreference(createUserDictionaryPreference(locale, activity));
             }
         }
diff --git a/src/com/android/settings/inputmethod/UserDictionarySettingsUtils.java b/src/com/android/settings/inputmethod/UserDictionarySettingsUtils.java
new file mode 100644
index 00000000000..e77f9c5addc
--- /dev/null
+++ b/src/com/android/settings/inputmethod/UserDictionarySettingsUtils.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import java.util.Locale;
+
+/**
+ * Utilities of the user dictionary settings
+ */
+public class UserDictionarySettingsUtils {
+    public static String getLocaleDisplayName(Context context, String localeStr) {
+        if (TextUtils.isEmpty(localeStr)) {
+            // CAVEAT: localeStr should not be null because a null locale stands for the system
+            // locale in UserDictionary.Words.addWord.
+            return context.getResources().getString(R.string.user_dict_settings_all_languages);
+        }
+        final Locale locale = Utils.createLocaleFromString(localeStr);
+        final Locale systemLocale = context.getResources().getConfiguration().locale;
+        return locale.getDisplayName(systemLocale);
+    }
+}
diff --git a/src/com/android/settings/location/InjectedSetting.java b/src/com/android/settings/location/InjectedSetting.java
new file mode 100644
index 00000000000..d8a3f495c55
--- /dev/null
+++ b/src/com/android/settings/location/InjectedSetting.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.location;
+
+import android.content.Intent;
+import android.text.TextUtils;
+import android.util.Log;
+import com.android.internal.annotations.Immutable;
+import com.android.internal.util.Preconditions;
+
+/**
+ * Specifies a setting that is being injected into Settings > Location > Location services.
+ *
+ * @see android.location.SettingInjectorService
+ */
+@Immutable
+class InjectedSetting {
+
+    /**
+     * Package for the subclass of {@link android.location.SettingInjectorService} and for the
+     * settings activity.
+     */
+    public final String packageName;
+
+    /**
+     * Class name for the subclass of {@link android.location.SettingInjectorService} that
+     * specifies dynamic values for the location setting.
+     */
+    public final String className;
+
+    /**
+     * The {@link android.preference.Preference#getTitle()} value.
+     */
+    public final String title;
+
+    /**
+     * The {@link android.preference.Preference#getIcon()} value.
+     */
+    public final int iconId;
+
+    /**
+     * The activity to launch to allow the user to modify the settings value. Assumed to be in the
+     * {@link #packageName} package.
+     */
+    public final String settingsActivity;
+
+    private InjectedSetting(String packageName, String className,
+            String title, int iconId, String settingsActivity) {
+        this.packageName = Preconditions.checkNotNull(packageName, "packageName");
+        this.className = Preconditions.checkNotNull(className, "className");
+        this.title = Preconditions.checkNotNull(title, "title");
+        this.iconId = iconId;
+        this.settingsActivity = Preconditions.checkNotNull(settingsActivity);
+    }
+
+    /**
+     * Returns a new instance, or null.
+     */
+    public static InjectedSetting newInstance(String packageName, String className,
+            String title, int iconId, String settingsActivity) {
+        if (packageName == null || className == null ||
+                TextUtils.isEmpty(title) || TextUtils.isEmpty(settingsActivity)) {
+            if (Log.isLoggable(SettingsInjector.TAG, Log.WARN)) {
+                Log.w(SettingsInjector.TAG, "Illegal setting specification: package="
+                        + packageName + ", class=" + className
+                        + ", title=" + title + ", settingsActivity=" + settingsActivity);
+            }
+            return null;
+        }
+        return new InjectedSetting(packageName, className, title, iconId, settingsActivity);
+    }
+
+    @Override
+    public String toString() {
+        return "InjectedSetting{" +
+                "mPackageName='" + packageName + '\'' +
+                ", mClassName='" + className + '\'' +
+                ", label=" + title +
+                ", iconId=" + iconId +
+                ", settingsActivity='" + settingsActivity + '\'' +
+                '}';
+    }
+
+    /**
+     * Returns the intent to start the {@link #className} service.
+     */
+    public Intent getServiceIntent() {
+        Intent intent = new Intent();
+        intent.setClassName(packageName, className);
+        return intent;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof InjectedSetting)) return false;
+
+        InjectedSetting that = (InjectedSetting) o;
+
+        return packageName.equals(that.packageName) && className.equals(that.className)
+                && title.equals(that.title) && iconId == that.iconId
+                && settingsActivity.equals(that.settingsActivity);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = packageName.hashCode();
+        result = 31 * result + className.hashCode();
+        result = 31 * result + title.hashCode();
+        result = 31 * result + iconId;
+        result = 31 * result + settingsActivity.hashCode();
+        return result;
+    }
+}
diff --git a/src/com/android/settings/location/LocationMode.java b/src/com/android/settings/location/LocationMode.java
new file mode 100644
index 00000000000..7e95cacbf4e
--- /dev/null
+++ b/src/com/android/settings/location/LocationMode.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.location;
+
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+
+import com.android.settings.R;
+
+/**
+ * A page with 3 radio buttons to choose the location mode.
+ *
+ * There are 3 location modes when location access is enabled:
+ *
+ * High accuracy: use both GPS and network location.
+ *
+ * Battery saving: use network location only to reduce the power consumption.
+ *
+ * Sensors only: use GPS location only.
+ */
+public class LocationMode extends LocationSettingsBase
+        implements RadioButtonPreference.OnClickListener {
+    private static final String KEY_HIGH_ACCURACY = "high_accuracy";
+    private RadioButtonPreference mHighAccuracy;
+    private static final String KEY_BATTERY_SAVING = "battery_saving";
+    private RadioButtonPreference mBatterySaving;
+    private static final String KEY_SENSORS_ONLY = "sensors_only";
+    private RadioButtonPreference mSensorsOnly;
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        createPreferenceHierarchy();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+    }
+
+    private PreferenceScreen createPreferenceHierarchy() {
+        PreferenceScreen root = getPreferenceScreen();
+        if (root != null) {
+            root.removeAll();
+        }
+        addPreferencesFromResource(R.xml.location_mode);
+        root = getPreferenceScreen();
+
+        mHighAccuracy = (RadioButtonPreference) root.findPreference(KEY_HIGH_ACCURACY);
+        mBatterySaving = (RadioButtonPreference) root.findPreference(KEY_BATTERY_SAVING);
+        mSensorsOnly = (RadioButtonPreference) root.findPreference(KEY_SENSORS_ONLY);
+        mHighAccuracy.setOnClickListener(this);
+        mBatterySaving.setOnClickListener(this);
+        mSensorsOnly.setOnClickListener(this);
+
+        refreshLocationMode();
+        return root;
+    }
+
+    private void updateRadioButtons(RadioButtonPreference activated) {
+        if (activated == null) {
+            mHighAccuracy.setChecked(false);
+            mBatterySaving.setChecked(false);
+            mSensorsOnly.setChecked(false);
+        } else if (activated == mHighAccuracy) {
+            mHighAccuracy.setChecked(true);
+            mBatterySaving.setChecked(false);
+            mSensorsOnly.setChecked(false);
+        } else if (activated == mBatterySaving) {
+            mHighAccuracy.setChecked(false);
+            mBatterySaving.setChecked(true);
+            mSensorsOnly.setChecked(false);
+        } else if (activated == mSensorsOnly) {
+            mHighAccuracy.setChecked(false);
+            mBatterySaving.setChecked(false);
+            mSensorsOnly.setChecked(true);
+        }
+    }
+
+    @Override
+    public void onRadioButtonClicked(RadioButtonPreference emiter) {
+        int mode = Settings.Secure.LOCATION_MODE_OFF;
+        if (emiter == mHighAccuracy) {
+            mode = Settings.Secure.LOCATION_MODE_HIGH_ACCURACY;
+        } else if (emiter == mBatterySaving) {
+            mode = Settings.Secure.LOCATION_MODE_BATTERY_SAVING;
+        } else if (emiter == mSensorsOnly) {
+            mode = Settings.Secure.LOCATION_MODE_SENSORS_ONLY;
+        }
+        setLocationMode(mode);
+    }
+
+    @Override
+    public void onModeChanged(int mode, boolean restricted) {
+        switch (mode) {
+            case Settings.Secure.LOCATION_MODE_OFF:
+                updateRadioButtons(null);
+                break;
+            case Settings.Secure.LOCATION_MODE_SENSORS_ONLY:
+                updateRadioButtons(mSensorsOnly);
+                break;
+            case Settings.Secure.LOCATION_MODE_BATTERY_SAVING:
+                updateRadioButtons(mBatterySaving);
+                break;
+            case Settings.Secure.LOCATION_MODE_HIGH_ACCURACY:
+                updateRadioButtons(mHighAccuracy);
+                break;
+            default:
+                break;
+        }
+
+        boolean enabled = (mode != Settings.Secure.LOCATION_MODE_OFF) && !restricted;
+        mHighAccuracy.setEnabled(enabled);
+        mBatterySaving.setEnabled(enabled);
+        mSensorsOnly.setEnabled(enabled);
+    }
+
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_location_access;
+    }
+}
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
new file mode 100644
index 00000000000..06a6650565d
--- /dev/null
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -0,0 +1,258 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.location;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.location.LocationManager;
+import android.location.SettingInjectorService;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceGroup;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.Gravity;
+import android.widget.CompoundButton;
+import android.widget.Switch;
+
+import com.android.settings.R;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * Location access settings.
+ */
+public class LocationSettings extends LocationSettingsBase
+        implements CompoundButton.OnCheckedChangeListener {
+
+    private static final String TAG = "LocationSettings";
+
+    /** Key for preference screen "Mode" */
+    private static final String KEY_LOCATION_MODE = "location_mode";
+    /** Key for preference category "Recent location requests" */
+    private static final String KEY_RECENT_LOCATION_REQUESTS = "recent_location_requests";
+    /** Key for preference category "Location services" */
+    private static final String KEY_LOCATION_SERVICES = "location_services";
+
+    private Switch mSwitch;
+    private boolean mValidListener;
+    private Preference mLocationMode;
+    private PreferenceCategory mCategoryRecentLocationRequests;
+    /** Receives UPDATE_INTENT  */
+    private BroadcastReceiver mReceiver;
+
+    public LocationSettings() {
+        mValidListener = false;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mSwitch = new Switch(getActivity());
+        mSwitch.setOnCheckedChangeListener(this);
+        mValidListener = true;
+        createPreferenceHierarchy();
+    }
+
+    @Override
+    public void onPause() {
+        try {
+            getActivity().unregisterReceiver(mReceiver);
+        } catch (RuntimeException e) {
+            // Ignore exceptions caused by race condition
+        }
+        super.onPause();
+        mValidListener = false;
+        mSwitch.setOnCheckedChangeListener(null);
+    }
+
+    private void addPreferencesSorted(List<Preference> prefs, PreferenceGroup container) {
+        // If there's some items to display, sort the items and add them to the container.
+        Collections.sort(prefs, new Comparator<Preference>() {
+            @Override
+            public int compare(Preference lhs, Preference rhs) {
+                return lhs.getTitle().toString().compareTo(rhs.getTitle().toString());
+            }
+        });
+        for (Preference entry : prefs) {
+            container.addPreference(entry);
+        }
+    }
+
+    private PreferenceScreen createPreferenceHierarchy() {
+        final PreferenceActivity activity = (PreferenceActivity) getActivity();
+        PreferenceScreen root = getPreferenceScreen();
+        if (root != null) {
+            root.removeAll();
+        }
+        addPreferencesFromResource(R.xml.location_settings);
+        root = getPreferenceScreen();
+
+        mLocationMode = root.findPreference(KEY_LOCATION_MODE);
+        mLocationMode.setOnPreferenceClickListener(
+                new Preference.OnPreferenceClickListener() {
+                    @Override
+                    public boolean onPreferenceClick(Preference preference) {
+                        activity.startPreferencePanel(
+                                LocationMode.class.getName(), null,
+                                R.string.location_mode_screen_title, null, LocationSettings.this,
+                                0);
+                        return true;
+                    }
+                });
+
+        mCategoryRecentLocationRequests =
+                (PreferenceCategory) root.findPreference(KEY_RECENT_LOCATION_REQUESTS);
+        RecentLocationApps recentApps = new RecentLocationApps(activity);
+        List<Preference> recentLocationRequests = recentApps.getAppList();
+        if (recentLocationRequests.size() > 0) {
+            addPreferencesSorted(recentLocationRequests, mCategoryRecentLocationRequests);
+        } else {
+            // If there's no item to display, add a "No recent apps" item.
+            Preference banner = new Preference(activity);
+            banner.setLayoutResource(R.layout.location_list_no_item);
+            banner.setTitle(R.string.location_no_recent_apps);
+            banner.setSelectable(false);
+            mCategoryRecentLocationRequests.addPreference(banner);
+        }
+
+        addLocationServices(activity, root);
+
+        // Only show the master switch when we're not in multi-pane mode, and not being used as
+        // Setup Wizard.
+        if (activity.onIsHidingHeaders() || !activity.onIsMultiPane()) {
+            final int padding = activity.getResources().getDimensionPixelSize(
+                    R.dimen.action_bar_switch_padding);
+            mSwitch.setPaddingRelative(0, 0, padding, 0);
+            activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                    ActionBar.DISPLAY_SHOW_CUSTOM);
+            activity.getActionBar().setCustomView(mSwitch, new ActionBar.LayoutParams(
+                    ActionBar.LayoutParams.WRAP_CONTENT,
+                    ActionBar.LayoutParams.WRAP_CONTENT,
+                    Gravity.CENTER_VERTICAL | Gravity.END));
+        }
+
+        setHasOptionsMenu(true);
+
+        refreshLocationMode();
+        return root;
+    }
+
+    /**
+     * Add the settings injected by external apps into the "App Settings" category. Hides the
+     * category if there are no injected settings.
+     *
+     * Reloads the settings whenever receives
+     * {@link SettingInjectorService#ACTION_INJECTED_SETTING_CHANGED}. As a safety measure,
+     * also reloads on {@link LocationManager#MODE_CHANGED_ACTION} to ensure the settings are
+     * up-to-date after mode changes even if an affected app doesn't send the setting changed
+     * broadcast.
+     */
+    private void addLocationServices(Context context, PreferenceScreen root) {
+        PreferenceCategory categoryLocationServices =
+                (PreferenceCategory) root.findPreference(KEY_LOCATION_SERVICES);
+        final SettingsInjector injector = new SettingsInjector(context);
+        List<Preference> locationServices = injector.getInjectedSettings();
+
+        mReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (Log.isLoggable(TAG, Log.DEBUG)) {
+                    Log.d(TAG, "Received settings change intent: " + intent);
+                }
+                injector.reloadStatusMessages();
+            }
+        };
+
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(SettingInjectorService.ACTION_INJECTED_SETTING_CHANGED);
+        filter.addAction(LocationManager.MODE_CHANGED_ACTION);
+        context.registerReceiver(mReceiver, filter);
+
+        if (locationServices.size() > 0) {
+            addPreferencesSorted(locationServices, categoryLocationServices);
+        } else {
+            // If there's no item to display, remove the whole category.
+            root.removePreference(categoryLocationServices);
+        }
+    }
+
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_location_access;
+    }
+
+    @Override
+    public void onModeChanged(int mode, boolean restricted) {
+        switch (mode) {
+            case Settings.Secure.LOCATION_MODE_OFF:
+                mLocationMode.setSummary(R.string.location_mode_location_off_title);
+                break;
+            case Settings.Secure.LOCATION_MODE_SENSORS_ONLY:
+                mLocationMode.setSummary(R.string.location_mode_sensors_only_title);
+                break;
+            case Settings.Secure.LOCATION_MODE_BATTERY_SAVING:
+                mLocationMode.setSummary(R.string.location_mode_battery_saving_title);
+                break;
+            case Settings.Secure.LOCATION_MODE_HIGH_ACCURACY:
+                mLocationMode.setSummary(R.string.location_mode_high_accuracy_title);
+                break;
+            default:
+                break;
+        }
+
+        // Restricted user can't change the location mode, so disable the master switch. But in some
+        // corner cases, the location might still be enabled. In such case the master switch should
+        // be disabled but checked.
+        boolean enabled = (mode != Settings.Secure.LOCATION_MODE_OFF);
+        mSwitch.setEnabled(!restricted);
+        mLocationMode.setEnabled(enabled && !restricted);
+        mCategoryRecentLocationRequests.setEnabled(enabled);
+
+        if (enabled != mSwitch.isChecked()) {
+            // set listener to null so that that code below doesn't trigger onCheckedChanged()
+            if (mValidListener) {
+                mSwitch.setOnCheckedChangeListener(null);
+            }
+            mSwitch.setChecked(enabled);
+            if (mValidListener) {
+                mSwitch.setOnCheckedChangeListener(this);
+            }
+        }
+    }
+
+    /**
+     * Listens to the state change of the location master switch.
+     */
+    @Override
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        if (isChecked) {
+            setLocationMode(Settings.Secure.LOCATION_MODE_HIGH_ACCURACY);
+        } else {
+            setLocationMode(Settings.Secure.LOCATION_MODE_OFF);
+        }
+    }
+}
diff --git a/src/com/android/settings/location/LocationSettingsBase.java b/src/com/android/settings/location/LocationSettingsBase.java
new file mode 100644
index 00000000000..86c2ee5e873
--- /dev/null
+++ b/src/com/android/settings/location/LocationSettingsBase.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.location;
+
+import android.app.LoaderManager.LoaderCallbacks;
+import android.content.Context;
+import android.content.CursorLoader;
+import android.content.Intent;
+import android.content.Loader;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.util.Log;
+
+import com.android.settings.SettingsPreferenceFragment;
+
+/**
+ * A base class that listens to location settings change and modifies location
+ * settings.
+ */
+public abstract class LocationSettingsBase extends SettingsPreferenceFragment
+        implements LoaderCallbacks<Cursor> {
+    private static final String TAG = "LocationSettingsBase";
+    /** Broadcast intent action when the location mode is about to change. */
+    private static final String MODE_CHANGING_ACTION =
+            "com.android.settings.location.MODE_CHANGING";
+    private static final String CURRENT_MODE_KEY = "CURRENT_MODE";
+    private static final String NEW_MODE_KEY = "NEW_MODE";
+
+    private static final int LOADER_ID_LOCATION_MODE = 1;
+    private int mCurrentMode;
+
+    /**
+     * Whether the fragment is actively running.
+     */
+    private boolean mActive = false;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        getLoaderManager().initLoader(LOADER_ID_LOCATION_MODE, null, this);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mActive = true;
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mActive = false;
+    }
+
+    /** Called when location mode has changed. */
+    public abstract void onModeChanged(int mode, boolean restricted);
+
+    private boolean isRestricted() {
+        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        return um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION);
+    }
+
+    public void setLocationMode(int mode) {
+        if (isRestricted()) {
+            // Location toggling disabled by user restriction. Read the current location mode to
+            // update the location master switch.
+            if (Log.isLoggable(TAG, Log.INFO)) {
+                Log.i(TAG, "Restricted user, not setting location mode");
+            }
+            mode = Settings.Secure.getInt(getContentResolver(), Settings.Secure.LOCATION_MODE,
+                    Settings.Secure.LOCATION_MODE_OFF);
+            if (mActive) {
+                onModeChanged(mode, true);
+            }
+            return;
+        }
+        Intent intent = new Intent(MODE_CHANGING_ACTION);
+        intent.putExtra(CURRENT_MODE_KEY, mCurrentMode);
+        intent.putExtra(NEW_MODE_KEY, mode);
+        getActivity().sendBroadcast(intent, android.Manifest.permission.WRITE_SECURE_SETTINGS);
+        Settings.Secure.putInt(getContentResolver(), Settings.Secure.LOCATION_MODE, mode);
+        refreshLocationMode();
+    }
+
+    public void refreshLocationMode() {
+        if (mActive) {
+            int mode = Settings.Secure.getInt(getContentResolver(), Settings.Secure.LOCATION_MODE,
+                    Settings.Secure.LOCATION_MODE_OFF);
+            mCurrentMode = mode;
+            onModeChanged(mode, isRestricted());
+        }
+    }
+
+    @Override
+    public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+        switch (id) {
+            case LOADER_ID_LOCATION_MODE:
+                return new CursorLoader(getActivity(), Settings.Secure.CONTENT_URI, null,
+                        "(" + Settings.System.NAME + "=?)",
+                        new String[] { Settings.Secure.LOCATION_MODE }, null);
+            default:
+                return null;
+        }
+    }
+
+    @Override
+    public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+        refreshLocationMode();
+    }
+
+    @Override
+    public void onLoaderReset(Loader<Cursor> loader) {
+        // Nothing to do here.
+    }
+}
diff --git a/src/com/android/settings/location/RadioButtonPreference.java b/src/com/android/settings/location/RadioButtonPreference.java
new file mode 100644
index 00000000000..5589dfa57d3
--- /dev/null
+++ b/src/com/android/settings/location/RadioButtonPreference.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.location;
+
+import android.content.Context;
+import android.preference.CheckBoxPreference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
+
+import com.android.settings.R;
+
+/**
+ * Check box preference with check box replaced by radio button.
+ *
+ * Functionally speaking, it's actually a CheckBoxPreference. We only modified
+ * the widget to RadioButton to make it "look like" a RadioButtonPreference.
+ *
+ * In other words, there's no "RadioButtonPreferenceGroup" in this
+ * implementation. When you check one RadioButtonPreference, if you want to
+ * uncheck all the other preferences, you should do that by code yourself.
+ */
+public class RadioButtonPreference extends CheckBoxPreference {
+    public interface OnClickListener {
+        public abstract void onRadioButtonClicked(RadioButtonPreference emiter);
+    }
+
+    private OnClickListener mListener = null;
+
+    public RadioButtonPreference(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        setWidgetLayoutResource(R.layout.preference_widget_radiobutton);
+    }
+
+    public RadioButtonPreference(Context context, AttributeSet attrs) {
+        this(context, attrs, com.android.internal.R.attr.checkBoxPreferenceStyle);
+    }
+
+    public RadioButtonPreference(Context context) {
+        this(context, null);
+    }
+
+    void setOnClickListener(OnClickListener listener) {
+        mListener = listener;
+    }
+
+    @Override
+    public void onClick() {
+        if (mListener != null) {
+            mListener.onRadioButtonClicked(this);
+        }
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        TextView title = (TextView) view.findViewById(android.R.id.title);
+        if (title != null) {
+            title.setSingleLine(false);
+            title.setMaxLines(3);
+        }
+    }
+}
diff --git a/src/com/android/settings/location/RecentLocationApps.java b/src/com/android/settings/location/RecentLocationApps.java
new file mode 100644
index 00000000000..57084348c04
--- /dev/null
+++ b/src/com/android/settings/location/RecentLocationApps.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.location;
+
+import android.app.ActivityManager;
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.os.Process;
+import android.os.UserHandle;
+import android.preference.Preference;
+import android.preference.PreferenceActivity;
+import android.util.Log;
+
+import com.android.settings.R;
+import com.android.settings.applications.InstalledAppDetails;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Retrieves the information of applications which accessed location recently.
+ */
+public class RecentLocationApps {
+    private static final String TAG = RecentLocationApps.class.getSimpleName();
+    private static final String ANDROID_SYSTEM_PACKAGE_NAME = "android";
+
+    private static final int RECENT_TIME_INTERVAL_MILLIS = 15 * 60 * 1000;
+
+    private final PreferenceActivity mActivity;
+    private final PackageManager mPackageManager;
+
+    public RecentLocationApps(PreferenceActivity activity) {
+        mActivity = activity;
+        mPackageManager = activity.getPackageManager();
+    }
+
+    private class PackageEntryClickedListener
+            implements Preference.OnPreferenceClickListener {
+        private String mPackage;
+
+        public PackageEntryClickedListener(String packageName) {
+            mPackage = packageName;
+        }
+
+        @Override
+        public boolean onPreferenceClick(Preference preference) {
+            // start new fragment to display extended information
+            Bundle args = new Bundle();
+            args.putString(InstalledAppDetails.ARG_PACKAGE_NAME, mPackage);
+            mActivity.startPreferencePanel(InstalledAppDetails.class.getName(), args,
+                    R.string.application_info_label, null, null, 0);
+            return true;
+        }
+    }
+
+    private Preference createRecentLocationEntry(
+            Drawable icon,
+            CharSequence label,
+            boolean isHighBattery,
+            Preference.OnPreferenceClickListener listener) {
+        Preference pref = new Preference(mActivity);
+        pref.setIcon(icon);
+        pref.setTitle(label);
+        if (isHighBattery) {
+            pref.setSummary(R.string.location_high_battery_use);
+        } else {
+            pref.setSummary(R.string.location_low_battery_use);
+        }
+        pref.setOnPreferenceClickListener(listener);
+        return pref;
+    }
+
+    /**
+     * Fills a list of applications which queried location recently within
+     * specified time.
+     */
+    public List<Preference> getAppList() {
+        // Retrieve a location usage list from AppOps
+        AppOpsManager aoManager =
+                (AppOpsManager) mActivity.getSystemService(Context.APP_OPS_SERVICE);
+        List<AppOpsManager.PackageOps> appOps = aoManager.getPackagesForOps(
+                new int[] {
+                    AppOpsManager.OP_MONITOR_LOCATION,
+                    AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION,
+                });
+
+        // Process the AppOps list and generate a preference list.
+        ArrayList<Preference> prefs = new ArrayList<Preference>();
+        long now = System.currentTimeMillis();
+        for (AppOpsManager.PackageOps ops : appOps) {
+            // Don't show the Android System in the list - it's not actionable for the user.
+            // Also don't show apps belonging to background users.
+            int uid = ops.getUid();
+            boolean isAndroidOs = (uid == Process.SYSTEM_UID)
+                    && ANDROID_SYSTEM_PACKAGE_NAME.equals(ops.getPackageName());
+            if (!isAndroidOs && ActivityManager.getCurrentUser() == UserHandle.getUserId(uid)) {
+                Preference pref = getPreferenceFromOps(now, ops);
+                if (pref != null) {
+                    prefs.add(pref);
+                }
+            }
+        }
+
+        return prefs;
+    }
+
+    /**
+     * Creates a Preference entry for the given PackageOps.
+     *
+     * This method examines the time interval of the PackageOps first. If the PackageOps is older
+     * than the designated interval, this method ignores the PackageOps object and returns null.
+     * When the PackageOps is fresh enough, this method returns a Preference pointing to the App
+     * Info page for that package.
+     */
+    private Preference getPreferenceFromOps(long now, AppOpsManager.PackageOps ops) {
+        String packageName = ops.getPackageName();
+        List<AppOpsManager.OpEntry> entries = ops.getOps();
+        boolean highBattery = false;
+        boolean normalBattery = false;
+        // Earliest time for a location request to end and still be shown in list.
+        long recentLocationCutoffTime = now - RECENT_TIME_INTERVAL_MILLIS;
+        for (AppOpsManager.OpEntry entry : entries) {
+            if (entry.isRunning() || entry.getTime() >= recentLocationCutoffTime) {
+                switch (entry.getOp()) {
+                    case AppOpsManager.OP_MONITOR_LOCATION:
+                        normalBattery = true;
+                        break;
+                    case AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION:
+                        highBattery = true;
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+
+        if (!highBattery && !normalBattery) {
+            if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                Log.v(TAG, packageName + " hadn't used location within the time interval.");
+            }
+            return null;
+        }
+
+        // The package is fresh enough, continue.
+
+        Preference pref = null;
+        try {
+          ApplicationInfo appInfo = mPackageManager.getApplicationInfo(
+              packageName, PackageManager.GET_META_DATA);
+          // Multiple users can install the same package. Each user gets a different Uid for
+          // the same package.
+          //
+          // Here we retrieve the Uid with package name, that will be the Uid for that package
+          // associated with the current active user. If the Uid differs from the Uid in ops,
+          // that means this entry belongs to another inactive user and we should ignore that.
+          if (appInfo.uid == ops.getUid()) {
+            pref = createRecentLocationEntry(
+                mPackageManager.getApplicationIcon(appInfo),
+                mPackageManager.getApplicationLabel(appInfo),
+                highBattery,
+                new PackageEntryClickedListener(packageName));
+          } else if (Log.isLoggable(TAG, Log.VERBOSE)) {
+            Log.v(TAG, "package " + packageName + " with Uid " + ops.getUid() +
+                " belongs to another inactive account, ignored.");
+          }
+        } catch (PackageManager.NameNotFoundException e) {
+          Log.wtf(TAG, "Package not found: " + packageName, e);
+        }
+
+        return pref;
+    }
+}
diff --git a/src/com/android/settings/location/SettingsInjector.java b/src/com/android/settings/location/SettingsInjector.java
new file mode 100644
index 00000000000..b9190802e88
--- /dev/null
+++ b/src/com/android/settings/location/SettingsInjector.java
@@ -0,0 +1,469 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.location;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.content.res.XmlResourceParser;
+import android.graphics.drawable.Drawable;
+import android.location.SettingInjectorService;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.os.Messenger;
+import android.os.SystemClock;
+import android.preference.Preference;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.Xml;
+import com.android.settings.R;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Adds the preferences specified by the {@link InjectedSetting} objects to a preference group.
+ *
+ * Duplicates some code from {@link android.content.pm.RegisteredServicesCache}. We do not use that
+ * class directly because it is not a good match for our use case: we do not need the caching, and
+ * so do not want the additional resource hit at app install/upgrade time; and we would have to
+ * suppress the tie-breaking between multiple services reporting settings with the same name.
+ * Code-sharing would require extracting {@link
+ * android.content.pm.RegisteredServicesCache#parseServiceAttributes(android.content.res.Resources,
+ * String, android.util.AttributeSet)} into an interface, which didn't seem worth it.
+ */
+class SettingsInjector {
+    static final String TAG = "SettingsInjector";
+
+    /**
+     * If reading the status of a setting takes longer than this, we go ahead and start reading
+     * the next setting.
+     */
+    private static final long INJECTED_STATUS_UPDATE_TIMEOUT_MILLIS = 1000;
+
+    /**
+     * {@link Message#what} value for starting to load status values
+     * in case we aren't already in the process of loading them.
+     */
+    private static final int WHAT_RELOAD = 1;
+
+    /**
+     * {@link Message#what} value sent after receiving a status message.
+     */
+    private static final int WHAT_RECEIVED_STATUS = 2;
+
+    /**
+     * {@link Message#what} value sent after the timeout waiting for a status message.
+     */
+    private static final int WHAT_TIMEOUT = 3;
+
+    private final Context mContext;
+
+    /**
+     * The settings that were injected
+     */
+    private final Set<Setting> mSettings;
+
+    private final Handler mHandler;
+
+    public SettingsInjector(Context context) {
+        mContext = context;
+        mSettings = new HashSet<Setting>();
+        mHandler = new StatusLoadingHandler();
+    }
+
+    /**
+     * Returns a list with one {@link InjectedSetting} object for each {@link android.app.Service}
+     * that responds to {@link SettingInjectorService#ACTION_SERVICE_INTENT} and provides the
+     * expected setting metadata.
+     *
+     * Duplicates some code from {@link android.content.pm.RegisteredServicesCache}.
+     *
+     * TODO: unit test
+     */
+    private List<InjectedSetting> getSettings() {
+        PackageManager pm = mContext.getPackageManager();
+        Intent intent = new Intent(SettingInjectorService.ACTION_SERVICE_INTENT);
+
+        List<ResolveInfo> resolveInfos =
+                pm.queryIntentServices(intent, PackageManager.GET_META_DATA);
+        if (Log.isLoggable(TAG, Log.DEBUG)) {
+            Log.d(TAG, "Found services: " + resolveInfos);
+        }
+        List<InjectedSetting> settings = new ArrayList<InjectedSetting>(resolveInfos.size());
+        for (ResolveInfo resolveInfo : resolveInfos) {
+            try {
+                InjectedSetting setting = parseServiceInfo(resolveInfo, pm);
+                if (setting == null) {
+                    Log.w(TAG, "Unable to load service info " + resolveInfo);
+                } else {
+                    settings.add(setting);
+                }
+            } catch (XmlPullParserException e) {
+                Log.w(TAG, "Unable to load service info " + resolveInfo, e);
+            } catch (IOException e) {
+                Log.w(TAG, "Unable to load service info " + resolveInfo, e);
+            }
+        }
+        if (Log.isLoggable(TAG, Log.DEBUG)) {
+            Log.d(TAG, "Loaded settings: " + settings);
+        }
+
+        return settings;
+    }
+
+    /**
+     * Returns the settings parsed from the attributes of the
+     * {@link SettingInjectorService#META_DATA_NAME} tag, or null.
+     *
+     * Duplicates some code from {@link android.content.pm.RegisteredServicesCache}.
+     */
+    private static InjectedSetting parseServiceInfo(ResolveInfo service, PackageManager pm)
+            throws XmlPullParserException, IOException {
+
+        ServiceInfo si = service.serviceInfo;
+        ApplicationInfo ai = si.applicationInfo;
+
+        if ((ai.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
+            if (Log.isLoggable(TAG, Log.WARN)) {
+                Log.w(TAG, "Ignoring attempt to inject setting from app not in system image: "
+                        + service);
+                return null;
+            }
+        }
+
+        XmlResourceParser parser = null;
+        try {
+            parser = si.loadXmlMetaData(pm, SettingInjectorService.META_DATA_NAME);
+            if (parser == null) {
+                throw new XmlPullParserException("No " + SettingInjectorService.META_DATA_NAME
+                        + " meta-data for " + service + ": " + si);
+            }
+
+            AttributeSet attrs = Xml.asAttributeSet(parser);
+
+            int type;
+            while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
+                    && type != XmlPullParser.START_TAG) {
+            }
+
+            String nodeName = parser.getName();
+            if (!SettingInjectorService.ATTRIBUTES_NAME.equals(nodeName)) {
+                throw new XmlPullParserException("Meta-data does not start with "
+                        + SettingInjectorService.ATTRIBUTES_NAME + " tag");
+            }
+
+            Resources res = pm.getResourcesForApplication(ai);
+            return parseAttributes(si.packageName, si.name, res, attrs);
+        } catch (PackageManager.NameNotFoundException e) {
+            throw new XmlPullParserException(
+                    "Unable to load resources for package " + si.packageName);
+        } finally {
+            if (parser != null) {
+                parser.close();
+            }
+        }
+    }
+
+    /**
+     * Returns an immutable representation of the static attributes for the setting, or null.
+     */
+    private static InjectedSetting parseAttributes(
+            String packageName, String className, Resources res, AttributeSet attrs) {
+
+        TypedArray sa = res.obtainAttributes(attrs, android.R.styleable.SettingInjectorService);
+        try {
+            // Note that to help guard against malicious string injection, we do not allow dynamic
+            // specification of the label (setting title)
+            final String title = sa.getString(android.R.styleable.SettingInjectorService_title);
+            final int iconId =
+                    sa.getResourceId(android.R.styleable.SettingInjectorService_icon, 0);
+            final String settingsActivity =
+                    sa.getString(android.R.styleable.SettingInjectorService_settingsActivity);
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
+                Log.d(TAG, "parsed title: " + title + ", iconId: " + iconId
+                        + ", settingsActivity: " + settingsActivity);
+            }
+            return InjectedSetting.newInstance(packageName, className,
+                    title, iconId, settingsActivity);
+        } finally {
+            sa.recycle();
+        }
+    }
+
+    /**
+     * Gets a list of preferences that other apps have injected.
+     */
+    public List<Preference> getInjectedSettings() {
+        Iterable<InjectedSetting> settings = getSettings();
+        ArrayList<Preference> prefs = new ArrayList<Preference>();
+        for (InjectedSetting setting : settings) {
+            Preference pref = addServiceSetting(prefs, setting);
+            mSettings.add(new Setting(setting, pref));
+        }
+
+        reloadStatusMessages();
+
+        return prefs;
+    }
+
+    /**
+     * Reloads the status messages for all the preference items.
+     */
+    public void reloadStatusMessages() {
+        if (Log.isLoggable(TAG, Log.DEBUG)) {
+            Log.d(TAG, "reloadingStatusMessages: " + mSettings);
+        }
+        mHandler.sendMessage(mHandler.obtainMessage(WHAT_RELOAD));
+    }
+
+    /**
+     * Adds an injected setting to the root with status "Loading...".
+     */
+    private Preference addServiceSetting(List<Preference> prefs, InjectedSetting info) {
+        Preference pref = new Preference(mContext);
+        pref.setTitle(info.title);
+        pref.setSummary(R.string.location_loading_injected_setting);
+        PackageManager pm = mContext.getPackageManager();
+        Drawable icon = pm.getDrawable(info.packageName, info.iconId, null);
+        pref.setIcon(icon);
+
+        Intent settingIntent = new Intent();
+        settingIntent.setClassName(info.packageName, info.settingsActivity);
+        pref.setIntent(settingIntent);
+
+        prefs.add(pref);
+        return pref;
+    }
+
+    /**
+     * Loads the setting status values one at a time. Each load starts a subclass of {@link
+     * SettingInjectorService}, so to reduce memory pressure we don't want to load too many at
+     * once.
+     */
+    private final class StatusLoadingHandler extends Handler {
+
+        /**
+         * Settings whose status values need to be loaded. A set is used to prevent redundant loads.
+         */
+        private Set<Setting> mSettingsToLoad = new HashSet<Setting>();
+
+        /**
+         * Settings that are being loaded now and haven't timed out. In practice this should have
+         * zero or one elements.
+         */
+        private Set<Setting> mSettingsBeingLoaded = new HashSet<Setting>();
+
+        /**
+         * Settings that are being loaded but have timed out. If only one setting has timed out, we
+         * will go ahead and start loading the next setting so that one slow load won't delay the
+         * load of the other settings.
+         */
+        private Set<Setting> mTimedOutSettings = new HashSet<Setting>();
+
+        private boolean mReloadRequested;
+
+        @Override
+        public void handleMessage(Message msg) {
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
+                Log.d(TAG, "handleMessage start: " + msg + ", " + this);
+            }
+
+            // Update state in response to message
+            switch (msg.what) {
+                case WHAT_RELOAD:
+                    mReloadRequested = true;
+                    break;
+                case WHAT_RECEIVED_STATUS:
+                    final Setting receivedSetting = (Setting) msg.obj;
+                    receivedSetting.maybeLogElapsedTime();
+                    mSettingsBeingLoaded.remove(receivedSetting);
+                    mTimedOutSettings.remove(receivedSetting);
+                    removeMessages(WHAT_TIMEOUT, receivedSetting);
+                    break;
+                case WHAT_TIMEOUT:
+                    final Setting timedOutSetting = (Setting) msg.obj;
+                    mSettingsBeingLoaded.remove(timedOutSetting);
+                    mTimedOutSettings.add(timedOutSetting);
+                    if (Log.isLoggable(TAG, Log.WARN)) {
+                        Log.w(TAG, "Timed out after " + timedOutSetting.getElapsedTime()
+                                + " millis trying to get status for: " + timedOutSetting);
+                    }
+                    break;
+                default:
+                    Log.wtf(TAG, "Unexpected what: " + msg);
+            }
+
+            // Decide whether to load additional settings based on the new state. Start by seeing
+            // if we have headroom to load another setting.
+            if (mSettingsBeingLoaded.size() > 0 || mTimedOutSettings.size() > 1) {
+                // Don't load any more settings until one of the pending settings has completed.
+                // To reduce memory pressure, we want to be loading at most one setting (plus at
+                // most one timed-out setting) at a time. This means we'll be responsible for
+                // bringing in at most two services.
+                if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                    Log.v(TAG, "too many services already live for " + msg + ", " + this);
+                }
+                return;
+            }
+
+            if (mReloadRequested && mSettingsToLoad.isEmpty() && mSettingsBeingLoaded.isEmpty()
+                    && mTimedOutSettings.isEmpty()) {
+                if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                    Log.v(TAG, "reloading because idle and reload requesteed " + msg + ", " + this);
+                }
+                // Reload requested, so must reload all settings
+                mSettingsToLoad.addAll(mSettings);
+                mReloadRequested = false;
+            }
+
+            // Remove the next setting to load from the queue, if any
+            Iterator<Setting> iter = mSettingsToLoad.iterator();
+            if (!iter.hasNext()) {
+                if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                    Log.v(TAG, "nothing left to do for " + msg + ", " + this);
+                }
+                return;
+            }
+            Setting setting = iter.next();
+            iter.remove();
+
+            // Request the status value
+            setting.startService();
+            mSettingsBeingLoaded.add(setting);
+
+            // Ensure that if receiving the status value takes too long, we start loading the
+            // next value anyway
+            Message timeoutMsg = obtainMessage(WHAT_TIMEOUT, setting);
+            sendMessageDelayed(timeoutMsg, INJECTED_STATUS_UPDATE_TIMEOUT_MILLIS);
+
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
+                Log.d(TAG, "handleMessage end " + msg + ", " + this
+                        + ", started loading " + setting);
+            }
+        }
+
+        @Override
+        public String toString() {
+            return "StatusLoadingHandler{" +
+                    "mSettingsToLoad=" + mSettingsToLoad +
+                    ", mSettingsBeingLoaded=" + mSettingsBeingLoaded +
+                    ", mTimedOutSettings=" + mTimedOutSettings +
+                    ", mReloadRequested=" + mReloadRequested +
+                    '}';
+        }
+    }
+
+    /**
+     * Represents an injected setting and the corresponding preference.
+     */
+    private final class Setting {
+
+        public final InjectedSetting setting;
+        public final Preference preference;
+        public long startMillis;
+
+        private Setting(InjectedSetting setting, Preference preference) {
+            this.setting = setting;
+            this.preference = preference;
+        }
+
+        @Override
+        public String toString() {
+            return "Setting{" +
+                    "setting=" + setting +
+                    ", preference=" + preference +
+                    '}';
+        }
+
+        /**
+         * Returns true if they both have the same {@link #setting} value. Ignores mutable
+         * {@link #preference} and {@link #startMillis} so that it's safe to use in sets.
+         */
+        @Override
+        public boolean equals(Object o) {
+            return this == o || o instanceof Setting && setting.equals(((Setting) o).setting);
+        }
+
+        @Override
+        public int hashCode() {
+            return setting.hashCode();
+        }
+
+        /**
+         * Starts the service to fetch for the current status for the setting, and updates the
+         * preference when the service replies.
+         */
+        public void startService() {
+            Handler handler = new Handler() {
+                @Override
+                public void handleMessage(Message msg) {
+                    Bundle bundle = msg.getData();
+                    String summary = bundle.getString(SettingInjectorService.SUMMARY_KEY);
+                    boolean enabled = bundle.getBoolean(SettingInjectorService.ENABLED_KEY, true);
+                    if (Log.isLoggable(TAG, Log.DEBUG)) {
+                        Log.d(TAG, setting + ": received " + msg + ", bundle: " + bundle);
+                    }
+                    preference.setSummary(summary);
+                    preference.setEnabled(enabled);
+                    mHandler.sendMessage(
+                            mHandler.obtainMessage(WHAT_RECEIVED_STATUS, Setting.this));
+                }
+            };
+            Messenger messenger = new Messenger(handler);
+
+            Intent intent = setting.getServiceIntent();
+            intent.putExtra(SettingInjectorService.MESSENGER_KEY, messenger);
+
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
+                Log.d(TAG, setting + ": sending update intent: " + intent
+                        + ", handler: " + handler);
+                startMillis = SystemClock.elapsedRealtime();
+            } else {
+                startMillis = 0;
+            }
+
+            // Start the service, making sure that this is attributed to the current user rather
+            // than the system user.
+            mContext.startServiceAsUser(intent, android.os.Process.myUserHandle());
+        }
+
+        public long getElapsedTime() {
+            long end = SystemClock.elapsedRealtime();
+            return end - startMillis;
+        }
+
+        public void maybeLogElapsedTime() {
+            if (Log.isLoggable(TAG, Log.DEBUG) && startMillis != 0) {
+                long elapsed = getElapsedTime();
+                Log.d(TAG, this + " update took " + elapsed + " millis");
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/net/UidDetailProvider.java b/src/com/android/settings/net/UidDetailProvider.java
index 63672b7348d..aca3e5d9308 100644
--- a/src/com/android/settings/net/UidDetailProvider.java
+++ b/src/com/android/settings/net/UidDetailProvider.java
@@ -121,7 +121,7 @@ public class UidDetailProvider {
             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);
+                detail.icon = UserUtils.getUserIcon(mContext, um, info, res);
                 return detail;
             }
         }
diff --git a/src/com/android/settings/nfc/PaymentBackend.java b/src/com/android/settings/nfc/PaymentBackend.java
new file mode 100644
index 00000000000..f84bc74d7c4
--- /dev/null
+++ b/src/com/android/settings/nfc/PaymentBackend.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.nfc;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
+import android.nfc.NfcAdapter;
+import android.nfc.cardemulation.ApduServiceInfo;
+import android.nfc.cardemulation.CardEmulation;
+import android.provider.Settings;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PaymentBackend {
+    public static final String TAG = "Settings.PaymentBackend";
+
+    public static class PaymentAppInfo {
+        CharSequence caption;
+        Drawable banner;
+        boolean isDefault;
+        public ComponentName componentName;
+    }
+
+    private final Context mContext;
+    private final NfcAdapter mAdapter;
+    private final CardEmulation mCardEmuManager;
+
+    public PaymentBackend(Context context) {
+        mContext = context;
+
+        mAdapter = NfcAdapter.getDefaultAdapter(context);
+        mCardEmuManager = CardEmulation.getInstance(mAdapter);
+    }
+
+    public List<PaymentAppInfo> getPaymentAppInfos() {
+        PackageManager pm = mContext.getPackageManager();
+        List<ApduServiceInfo> serviceInfos =
+                mCardEmuManager.getServices(CardEmulation.CATEGORY_PAYMENT);
+        List<PaymentAppInfo> appInfos = new ArrayList<PaymentAppInfo>();
+
+        if (serviceInfos == null) return appInfos;
+
+        ComponentName defaultApp = getDefaultPaymentApp();
+
+        for (ApduServiceInfo service : serviceInfos) {
+            PaymentAppInfo appInfo = new PaymentAppInfo();
+            appInfo.banner = service.loadBanner(pm);
+            appInfo.caption = service.getDescription();
+            if (appInfo.caption == null) {
+                appInfo.caption = service.loadLabel(pm);
+            }
+            appInfo.isDefault = service.getComponent().equals(defaultApp);
+            appInfo.componentName = service.getComponent();
+            appInfos.add(appInfo);
+        }
+
+        return appInfos;
+    }
+
+    ComponentName getDefaultPaymentApp() {
+        String componentString = Settings.Secure.getString(mContext.getContentResolver(),
+                Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT);
+        if (componentString != null) {
+            return ComponentName.unflattenFromString(componentString);
+        } else {
+            return null;
+        }
+    }
+
+    public void setDefaultPaymentApp(ComponentName app) {
+        Settings.Secure.putString(mContext.getContentResolver(),
+                Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT,
+                app != null ? app.flattenToString() : null);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/nfc/PaymentDefaultDialog.java b/src/com/android/settings/nfc/PaymentDefaultDialog.java
new file mode 100644
index 00000000000..61c6fdba6b0
--- /dev/null
+++ b/src/com/android/settings/nfc/PaymentDefaultDialog.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.nfc;
+
+import android.content.ComponentName;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.nfc.cardemulation.ApduServiceInfo;
+import android.nfc.cardemulation.CardEmulation;
+import android.nfc.cardemulation.HostApduService;
+import android.nfc.cardemulation.OffHostApduService;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.android.internal.app.AlertActivity;
+import com.android.internal.app.AlertController;
+import com.android.settings.R;
+import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.xmlpull.v1.XmlPullParserException;
+
+public final class PaymentDefaultDialog extends AlertActivity implements
+        DialogInterface.OnClickListener {
+
+    public static final String TAG = "PaymentDefaultDialog";
+
+    private PaymentBackend mBackend;
+    private ComponentName mNewDefault;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mBackend = new PaymentBackend(this);
+        Intent intent = getIntent();
+        ComponentName component = intent.getParcelableExtra(
+                CardEmulation.EXTRA_SERVICE_COMPONENT);
+        String category = intent.getStringExtra(CardEmulation.EXTRA_CATEGORY);
+
+        setResult(RESULT_CANCELED);
+        if (!buildDialog(component, category)) {
+            finish();
+        }
+
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        switch (which) {
+            case BUTTON_POSITIVE:
+                mBackend.setDefaultPaymentApp(mNewDefault);
+                setResult(RESULT_OK);
+                break;
+            case BUTTON_NEGATIVE:
+                break;
+        }
+    }
+
+    private boolean buildDialog(ComponentName component, String category) {
+        if (component == null || category == null) {
+            Log.e(TAG, "Component or category are null");
+            return false;
+        }
+
+        if (!CardEmulation.CATEGORY_PAYMENT.equals(category)) {
+            Log.e(TAG, "Don't support defaults for category " + category);
+            return false;
+        }
+
+        // Check if passed in service exists
+        PaymentAppInfo requestedPaymentApp = null;
+        PaymentAppInfo defaultPaymentApp = null;
+
+        List<PaymentAppInfo> services = mBackend.getPaymentAppInfos();
+        for (PaymentAppInfo service : services) {
+            if (component.equals(service.componentName)) {
+                requestedPaymentApp = service;
+            }
+            if (service.isDefault) {
+                defaultPaymentApp = service;
+            }
+        }
+
+        if (requestedPaymentApp == null) {
+            Log.e(TAG, "Component " + component + " is not a registered payment service.");
+            return false;
+        }
+
+        // Get current mode and default component
+        ComponentName defaultComponent = mBackend.getDefaultPaymentApp();
+        if (defaultComponent != null && defaultComponent.equals(component)) {
+            Log.e(TAG, "Component " + component + " is already default.");
+            return false;
+        }
+
+        mNewDefault = component;
+        // Compose dialog; get
+        final AlertController.AlertParams p = mAlertParams;
+        p.mTitle = getString(R.string.nfc_payment_set_default_label);
+        if (defaultPaymentApp == null) {
+            String formatString = getString(R.string.nfc_payment_set_default);
+            String msg = String.format(formatString, requestedPaymentApp.caption);
+            p.mMessage = msg;
+        } else {
+            String formatString = getString(R.string.nfc_payment_set_default_instead_of);
+            String msg = String.format(formatString, requestedPaymentApp.caption,
+                    defaultPaymentApp.caption);
+            p.mMessage = msg;
+        }
+        p.mPositiveButtonText = getString(R.string.yes);
+        p.mNegativeButtonText = getString(R.string.no);
+        p.mPositiveButtonListener = this;
+        p.mNegativeButtonListener = this;
+        setupAlert();
+
+        return true;
+    }
+
+}
diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java
new file mode 100644
index 00000000000..7548c5099ef
--- /dev/null
+++ b/src/com/android/settings/nfc/PaymentSettings.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.nfc;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.preference.Preference;
+import android.preference.PreferenceManager;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.RadioButton;
+import android.widget.TextView;
+
+import com.android.internal.content.PackageMonitor;
+import com.android.settings.HelpUtils;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
+
+import java.util.List;
+
+public class PaymentSettings extends SettingsPreferenceFragment implements
+        OnClickListener {
+    public static final String TAG = "PaymentSettings";
+    private LayoutInflater mInflater;
+    private PaymentBackend mPaymentBackend;
+    private final PackageMonitor mSettingsPackageMonitor = new SettingsPackageMonitor();
+
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mPaymentBackend = new PaymentBackend(getActivity());
+        mInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        setHasOptionsMenu(true);
+    }
+
+    public void refresh() {
+        PreferenceManager manager = getPreferenceManager();
+        PreferenceScreen screen = manager.createPreferenceScreen(getActivity());
+        // Get all payment services
+        List<PaymentAppInfo> appInfos = mPaymentBackend.getPaymentAppInfos();
+        if (appInfos != null && appInfos.size() > 0) {
+            // Add all payment apps
+            for (PaymentAppInfo appInfo : appInfos) {
+                PaymentAppPreference preference =
+                        new PaymentAppPreference(getActivity(), appInfo, this);
+                preference.setTitle(appInfo.caption);
+                if (appInfo.banner != null) {
+                    screen.addPreference(preference);
+                } else {
+                    // Ignore, no banner
+                    Log.e(TAG, "Couldn't load banner drawable of service " + appInfo.componentName);
+                }
+            }
+        }
+        TextView emptyText = (TextView) getView().findViewById(R.id.nfc_payment_empty_text);
+        TextView learnMore = (TextView) getView().findViewById(R.id.nfc_payment_learn_more);
+        ImageView emptyImage = (ImageView) getView().findViewById(R.id.nfc_payment_tap_image);
+        if (screen.getPreferenceCount() == 0) {
+            emptyText.setVisibility(View.VISIBLE);
+            learnMore.setVisibility(View.VISIBLE);
+            emptyImage.setVisibility(View.VISIBLE);
+            getListView().setVisibility(View.GONE);
+        } else {
+            emptyText.setVisibility(View.GONE);
+            learnMore.setVisibility(View.GONE);
+            emptyImage.setVisibility(View.GONE);
+            getListView().setVisibility(View.VISIBLE);
+        }
+        setPreferenceScreen(screen);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        View v = mInflater.inflate(R.layout.nfc_payment, container, false);
+        TextView learnMore = (TextView) v.findViewById(R.id.nfc_payment_learn_more);
+        learnMore.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String helpUrl;
+                if (!TextUtils.isEmpty(helpUrl = getResources().getString(
+                        R.string.help_url_nfc_payment))) {
+                    final Uri fullUri = HelpUtils.uriWithAddedParameters(
+                            PaymentSettings.this.getActivity(), Uri.parse(helpUrl));
+                    Intent intent = new Intent(Intent.ACTION_VIEW, fullUri);
+                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                            | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+                    startActivity(intent);
+                } else {
+                    Log.e(TAG, "Help url not set.");
+                }
+            }
+        });
+        return v;
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getTag() instanceof PaymentAppInfo) {
+            PaymentAppInfo appInfo = (PaymentAppInfo) v.getTag();
+            if (appInfo.componentName != null) {
+                mPaymentBackend.setDefaultPaymentApp(appInfo.componentName);
+            }
+            refresh();
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
+        refresh();
+    }
+
+    @Override
+    public void onPause() {
+        mSettingsPackageMonitor.unregister();
+        super.onPause();
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        String searchUri = Settings.Secure.getString(getContentResolver(),
+                Settings.Secure.PAYMENT_SERVICE_SEARCH_URI);
+        if (!TextUtils.isEmpty(searchUri)) {
+            MenuItem menuItem = menu.add(R.string.nfc_payment_menu_item_add_service);
+            menuItem.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            menuItem.setIntent(new Intent(Intent.ACTION_VIEW,Uri.parse(searchUri)));
+        }
+    }
+
+    private final Handler mHandler = new Handler() {
+        @Override
+        public void dispatchMessage(Message msg) {
+            refresh();
+        }
+    };
+
+    private class SettingsPackageMonitor extends PackageMonitor {
+        @Override
+        public void onPackageAdded(String packageName, int uid) {
+           mHandler.obtainMessage().sendToTarget();
+        }
+
+        @Override
+        public void onPackageAppeared(String packageName, int reason) {
+            mHandler.obtainMessage().sendToTarget();
+        }
+
+        @Override
+        public void onPackageDisappeared(String packageName, int reason) {
+            mHandler.obtainMessage().sendToTarget();
+        }
+
+        @Override
+        public void onPackageRemoved(String packageName, int uid) {
+            mHandler.obtainMessage().sendToTarget();
+        }
+    }
+
+    public static class PaymentAppPreference extends Preference {
+        private final OnClickListener listener;
+        private final PaymentAppInfo appInfo;
+
+        public PaymentAppPreference(Context context, PaymentAppInfo appInfo,
+                OnClickListener listener) {
+            super(context);
+            setLayoutResource(R.layout.nfc_payment_option);
+            this.appInfo = appInfo;
+            this.listener = listener;
+        }
+
+        @Override
+        protected void onBindView(View view) {
+            super.onBindView(view);
+
+            view.setOnClickListener(listener);
+            view.setTag(appInfo);
+
+            RadioButton radioButton = (RadioButton) view.findViewById(android.R.id.button1);
+            radioButton.setChecked(appInfo.isDefault);
+
+            ImageView banner = (ImageView) view.findViewById(R.id.banner);
+            banner.setImageDrawable(appInfo.banner);
+        }
+    }
+}
diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java
new file mode 100644
index 00000000000..cfb4cb203f1
--- /dev/null
+++ b/src/com/android/settings/print/PrintJobSettingsFragment.java
@@ -0,0 +1,218 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.print;
+
+import android.app.ActivityManager;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.print.PrintJob;
+import android.print.PrintJobId;
+import android.print.PrintJobInfo;
+import android.print.PrintManager;
+import android.print.PrintManager.PrintJobStateChangeListener;
+import android.text.TextUtils;
+import android.text.format.DateUtils;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+import java.text.DateFormat;
+
+/**
+ * Fragment for management of a print job.
+ */
+public class PrintJobSettingsFragment extends SettingsPreferenceFragment {
+    private static final int MENU_ITEM_ID_CANCEL = 1;
+    private static final int MENU_ITEM_ID_RESTART = 2;
+
+    private static final String EXTRA_PRINT_JOB_ID = "EXTRA_PRINT_JOB_ID";
+
+    private static final String PRINT_JOB_PREFERENCE = "print_job_preference";
+    private static final String PRINT_JOB_MESSAGE_PREFERENCE = "print_job_message_preference";
+
+    private Drawable mListDivider;
+
+    private final PrintJobStateChangeListener mPrintJobStateChangeListener =
+            new PrintJobStateChangeListener() {
+        @Override
+        public void onPrintJobStateChanged(PrintJobId printJobId) {
+            updateUi();
+        }
+    };
+
+    private PrintManager mPrintManager;
+
+    private Preference mPrintJobPreference;
+    private Preference mMessagePreference;
+
+    private PrintJobId mPrintJobId;
+    private PrintJob mPrintJob;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        addPreferencesFromResource(R.xml.print_job_settings);
+        mPrintJobPreference = findPreference(PRINT_JOB_PREFERENCE);
+        mMessagePreference = findPreference(PRINT_JOB_MESSAGE_PREFERENCE);
+
+        mPrintManager = ((PrintManager) getActivity().getSystemService(
+                Context.PRINT_SERVICE)).getGlobalPrintManagerForUser(
+                        ActivityManager.getCurrentUser());
+
+        getActivity().setTitle(R.string.print_print_job);
+
+        processArguments();
+
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        getListView().setEnabled(false);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mPrintManager.addPrintJobStateChangeListener(
+                mPrintJobStateChangeListener);
+        updateUi();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mPrintManager.removePrintJobStateChangeListener(
+                mPrintJobStateChangeListener);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+
+        MenuItem cancel = menu.add(0, MENU_ITEM_ID_CANCEL, Menu.NONE,
+                getString(R.string.print_cancel));
+        cancel.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+
+        if (mPrintJob.isFailed()) {
+            MenuItem restart = menu.add(0, MENU_ITEM_ID_RESTART, Menu.NONE,
+                    getString(R.string.print_restart));
+            restart.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case MENU_ITEM_ID_CANCEL: {
+                mPrintJob.cancel();
+                finish();
+                return true;
+            }
+
+            case MENU_ITEM_ID_RESTART: {
+                mPrintJob.restart();
+                finish();
+                return true;
+            }
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void processArguments() {
+        String printJobId = getArguments().getString(EXTRA_PRINT_JOB_ID);
+        mPrintJobId = PrintJobId.unflattenFromString(printJobId);
+        if (mPrintJobId == null) {
+            finish();
+        }
+    }
+
+    private void updateUi() {
+        mPrintJob = mPrintManager.getPrintJob(mPrintJobId);
+
+        if (mPrintJob == null) {
+            finish();
+            return;
+        }
+
+        if (mPrintJob.isCancelled() || mPrintJob.isCompleted()) {
+            finish();
+            return;
+        }
+
+        PrintJobInfo info = mPrintJob.getInfo();
+
+        switch (info.getState()) {
+            case PrintJobInfo.STATE_QUEUED:
+            case PrintJobInfo.STATE_STARTED: {
+                mPrintJobPreference.setTitle(getString(
+                        R.string.print_printing_state_title_template, info.getLabel()));
+            } break;
+
+            case PrintJobInfo.STATE_FAILED: {
+                mPrintJobPreference.setTitle(getString(
+                        R.string.print_failed_state_title_template, info.getLabel()));
+            } break;
+
+            case PrintJobInfo.STATE_BLOCKED: {
+                mPrintJobPreference.setTitle(getString(
+                        R.string.print_blocked_state_title_template, info.getLabel()));
+            } break;
+        }
+
+        mPrintJobPreference.setSummary(getString(R.string.print_job_summary,
+                info.getPrinterName(), DateUtils.formatSameDayTime(
+                        info.getCreationTime(), info.getCreationTime(), DateFormat.SHORT,
+                        DateFormat.SHORT)));
+
+        switch (info.getState()) {
+            case PrintJobInfo.STATE_QUEUED:
+            case PrintJobInfo.STATE_STARTED: {
+                mPrintJobPreference.setIcon(com.android.internal.R.drawable.ic_print);
+            } break;
+
+            case PrintJobInfo.STATE_FAILED:
+            case PrintJobInfo.STATE_BLOCKED: {
+                mPrintJobPreference.setIcon(com.android.internal.R.drawable.ic_print_error);
+            } break;
+        }
+
+        String stateReason = info.getStateReason();
+        if (!TextUtils.isEmpty(stateReason)) {
+            if (getPreferenceScreen().findPreference(PRINT_JOB_MESSAGE_PREFERENCE) == null) {
+                getPreferenceScreen().addPreference(mMessagePreference);
+            }
+            mMessagePreference.setSummary(stateReason);
+            getListView().setDivider(null);
+        } else {
+            getPreferenceScreen().removePreference(mMessagePreference);
+            getListView().setDivider(mListDivider);
+        }
+
+        getActivity().invalidateOptionsMenu();
+    }
+}
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
new file mode 100644
index 00000000000..326dd78c30c
--- /dev/null
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -0,0 +1,801 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.print;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.LoaderManager;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.Loader;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
+import android.database.ContentObserver;
+import android.database.DataSetObserver;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.preference.PreferenceActivity;
+import android.print.PrintManager;
+import android.print.PrinterDiscoverySession;
+import android.print.PrinterDiscoverySession.OnPrintersChangeListener;
+import android.print.PrinterId;
+import android.print.PrinterInfo;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityManager;
+import android.widget.BaseAdapter;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.Filter;
+import android.widget.Filterable;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.SearchView;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.print.PrintSettingsFragment.ToggleSwitch;
+import com.android.settings.print.PrintSettingsFragment.ToggleSwitch.OnBeforeCheckedChangeListener;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+/**
+ * Fragment with print service settings.
+ */
+public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
+        implements DialogInterface.OnClickListener {
+
+    private static final int LOADER_ID_PRINTERS_LOADER = 1;
+
+    private static final int DIALOG_ID_ENABLE_WARNING = 1;
+
+    private final SettingsContentObserver mSettingsContentObserver =
+            new SettingsContentObserver(new Handler()) {
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            updateUiForServiceState();
+        }
+    };
+
+    private final DataSetObserver mDataObserver = new DataSetObserver() {
+        @Override
+        public void onChanged() {
+            invalidateOptionsMenuIfNeeded();
+            updateEmptyView();
+        }
+
+        @Override
+        public void onInvalidated() {
+            invalidateOptionsMenuIfNeeded();
+        }
+
+        private void invalidateOptionsMenuIfNeeded() {
+            final int unfilteredItemCount = mPrintersAdapter.getUnfilteredCount();
+            if ((mLastUnfilteredItemCount <= 0 && unfilteredItemCount > 0)
+                    || mLastUnfilteredItemCount > 0 && unfilteredItemCount <= 0) {
+                getActivity().invalidateOptionsMenu();
+            }
+            mLastUnfilteredItemCount = unfilteredItemCount;
+        }
+    };
+
+    private ToggleSwitch mToggleSwitch;
+
+    private String mPreferenceKey;
+
+    private CharSequence mSettingsTitle;
+    private Intent mSettingsIntent;
+
+    private CharSequence mAddPrintersTitle;
+    private Intent mAddPrintersIntent;
+
+    private CharSequence mEnableWarningTitle;
+    private CharSequence mEnableWarningMessage;
+
+    private ComponentName mComponentName;
+
+    private PrintersAdapter mPrintersAdapter;
+
+    private int mLastUnfilteredItemCount;
+
+    private boolean mServiceEnabled;
+
+    private AnnounceFilterResult mAnnounceFilterResult;
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mSettingsContentObserver.register(getContentResolver());
+        updateEmptyView();
+        updateUiForServiceState();
+    }
+
+    @Override
+    public void onPause() {
+        mSettingsContentObserver.unregister(getContentResolver());
+        if (mAnnounceFilterResult != null) {
+            mAnnounceFilterResult.remove();
+        }
+        super.onPause();
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        initComponents();
+        updateUiForArguments();
+    }
+
+    @Override
+    public void onDestroyView() {
+        getActivity().getActionBar().setCustomView(null);
+        mToggleSwitch.setOnBeforeCheckedChangeListener(null);
+        super.onDestroyView();
+    }
+
+    private void onPreferenceToggled(String preferenceKey, boolean enabled) {
+        ComponentName service = ComponentName.unflattenFromString(preferenceKey);
+        List<ComponentName> services = SettingsUtils.readEnabledPrintServices(getActivity());
+        if (enabled) {
+            services.add(service);
+        } else {
+            services.remove(service);
+        }
+        SettingsUtils.writeEnabledPrintServices(getActivity(), services);
+    }
+
+    @Override
+    public Dialog onCreateDialog(int dialogId) {
+        CharSequence title = null;
+        CharSequence message = null;
+        switch (dialogId) {
+            case DIALOG_ID_ENABLE_WARNING:
+                title = mEnableWarningTitle;
+                message = mEnableWarningMessage;
+                break;
+            default:
+                throw new IllegalArgumentException();
+        }
+        return new AlertDialog.Builder(getActivity())
+                .setTitle(title)
+                .setIconAttribute(android.R.attr.alertDialogIcon)
+                .setMessage(message)
+                .setCancelable(true)
+                .setPositiveButton(android.R.string.ok, this)
+                .setNegativeButton(android.R.string.cancel, this)
+                .create();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        final boolean checked;
+        switch (which) {
+            case DialogInterface.BUTTON_POSITIVE:
+                checked = true;
+                mToggleSwitch.setCheckedInternal(checked);
+                getArguments().putBoolean(PrintSettingsFragment.EXTRA_CHECKED, checked);
+                onPreferenceToggled(mPreferenceKey, checked);
+                break;
+            case DialogInterface.BUTTON_NEGATIVE:
+                checked = false;
+                mToggleSwitch.setCheckedInternal(checked);
+                getArguments().putBoolean(PrintSettingsFragment.EXTRA_CHECKED, checked);
+                onPreferenceToggled(mPreferenceKey, checked);
+                break;
+            default:
+                throw new IllegalArgumentException();
+        }
+    }
+
+    private void updateEmptyView() {
+        ListView listView = getListView();
+        ViewGroup contentRoot = (ViewGroup) listView.getParent();
+        View emptyView = listView.getEmptyView();
+        if (!mToggleSwitch.isChecked()) {
+            if (emptyView != null && emptyView.getId() != R.id.empty_print_state) {
+                contentRoot.removeView(emptyView);
+                emptyView = null;
+            }
+            if (emptyView == null) {
+                emptyView = getActivity().getLayoutInflater().inflate(
+                        R.layout.empty_print_state, contentRoot, false);
+                emptyView.setContentDescription(getString(R.string.print_service_disabled));
+                TextView textView = (TextView) emptyView.findViewById(R.id.message);
+                textView.setText(R.string.print_service_disabled);
+                contentRoot.addView(emptyView);
+                listView.setEmptyView(emptyView);
+            }
+        } else if (mPrintersAdapter.getUnfilteredCount() <= 0) {
+            if (emptyView != null
+                    && emptyView.getId() != R.id.empty_printers_list_service_enabled) {
+                contentRoot.removeView(emptyView);
+                emptyView = null;
+            }
+            if (emptyView == null) {
+                emptyView = getActivity().getLayoutInflater().inflate(
+                        R.layout.empty_printers_list_service_enabled, contentRoot, false);
+                contentRoot.addView(emptyView);
+                listView.setEmptyView(emptyView);
+            }
+        } else if (mPrintersAdapter.getCount() <= 0) {
+            if (emptyView != null && emptyView.getId() != R.id.empty_print_state) {
+                contentRoot.removeView(emptyView);
+                emptyView = null;
+            }
+            if (emptyView == null) {
+                emptyView = getActivity().getLayoutInflater().inflate(
+                        R.layout.empty_print_state, contentRoot, false);
+                emptyView.setContentDescription(getString(R.string.print_no_printers_found));
+                TextView textView = (TextView) emptyView.findViewById(R.id.message);
+                textView.setText(R.string.print_no_printers_found);
+                contentRoot.addView(emptyView);
+                listView.setEmptyView(emptyView);
+            }
+        }
+    }
+
+    private void updateUiForServiceState() {
+        List<ComponentName> services = SettingsUtils.readEnabledPrintServices(getActivity());
+        mServiceEnabled = services.contains(mComponentName);
+        if (mServiceEnabled) {
+            mToggleSwitch.setCheckedInternal(true);
+            mPrintersAdapter.enable();
+        } else {
+            mToggleSwitch.setCheckedInternal(false);
+            mPrintersAdapter.disable();
+        }
+        getActivity().invalidateOptionsMenu();
+    }
+
+    private void initComponents() {
+        mPrintersAdapter = new PrintersAdapter();
+        mPrintersAdapter.registerDataSetObserver(mDataObserver);
+
+        mToggleSwitch = createAndAddActionBarToggleSwitch(getActivity());
+        mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
+            @Override
+            public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
+                if (checked) {
+                    if (!TextUtils.isEmpty(mEnableWarningMessage)) {
+                        toggleSwitch.setCheckedInternal(false);
+                        getArguments().putBoolean(PrintSettingsFragment.EXTRA_CHECKED, false);
+                        showDialog(DIALOG_ID_ENABLE_WARNING);
+                        return true;
+                    }
+                    onPreferenceToggled(mPreferenceKey, true);
+                } else {
+                    onPreferenceToggled(mPreferenceKey, false);
+                }
+                return false;
+            }
+        });
+        mToggleSwitch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                updateEmptyView();
+            }
+        });
+
+        getListView().setSelector(new ColorDrawable(Color.TRANSPARENT));
+        getListView().setAdapter(mPrintersAdapter);
+    }
+
+    private void updateUiForArguments() {
+        Bundle arguments = getArguments();
+
+        // Key.
+        mPreferenceKey = arguments.getString(PrintSettingsFragment.EXTRA_PREFERENCE_KEY);
+
+        // Enabled.
+        final boolean enabled = arguments.getBoolean(PrintSettingsFragment.EXTRA_CHECKED);
+        mToggleSwitch.setCheckedInternal(enabled);
+
+        // Title.
+        PreferenceActivity activity = (PreferenceActivity) getActivity();
+        if (!activity.onIsMultiPane() || activity.onIsHidingHeaders()) {
+            // PreferenceActivity allows passing as an extra only title by its
+            // resource id but we do not have the resource id for the print
+            // service label. Therefore, we do it ourselves.
+            String title = arguments.getString(PrintSettingsFragment.EXTRA_TITLE);
+            getActivity().setTitle(title);
+        }
+
+        // Settings title and intent.
+        String settingsTitle = arguments.getString(PrintSettingsFragment.EXTRA_SETTINGS_TITLE);
+        String settingsComponentName = arguments.getString(
+                PrintSettingsFragment.EXTRA_SETTINGS_COMPONENT_NAME);
+        if (!TextUtils.isEmpty(settingsTitle) && !TextUtils.isEmpty(settingsComponentName)) {
+            Intent settingsIntent = new Intent(Intent.ACTION_MAIN).setComponent(
+                    ComponentName.unflattenFromString(settingsComponentName.toString()));
+            List<ResolveInfo> resolvedActivities = getPackageManager().queryIntentActivities(
+                    settingsIntent, 0);
+            if (!resolvedActivities.isEmpty()) {
+                // The activity is a component name, therefore it is one or none.
+                if (resolvedActivities.get(0).activityInfo.exported) {
+                    mSettingsTitle = settingsTitle;
+                    mSettingsIntent = settingsIntent;
+                }
+            }
+        }
+
+        // Add printers title and intent.
+        String addPrintersTitle = arguments.getString(
+                PrintSettingsFragment.EXTRA_ADD_PRINTERS_TITLE);
+        String addPrintersComponentName =
+                arguments.getString(PrintSettingsFragment.EXTRA_ADD_PRINTERS_COMPONENT_NAME);
+        if (!TextUtils.isEmpty(addPrintersTitle)
+                && !TextUtils.isEmpty(addPrintersComponentName)) {
+            Intent addPritnersIntent = new Intent(Intent.ACTION_MAIN).setComponent(
+                    ComponentName.unflattenFromString(addPrintersComponentName.toString()));
+            List<ResolveInfo> resolvedActivities = getPackageManager().queryIntentActivities(
+                    addPritnersIntent, 0);
+            if (!resolvedActivities.isEmpty()) {
+                // The activity is a component name, therefore it is one or none.
+                if (resolvedActivities.get(0).activityInfo.exported) {
+                    mAddPrintersTitle = addPrintersTitle;
+                    mAddPrintersIntent = addPritnersIntent;
+                }
+            }
+        }
+
+        // Enable warning title.
+        mEnableWarningTitle = arguments.getCharSequence(
+                PrintSettingsFragment.EXTRA_ENABLE_WARNING_TITLE);
+
+        // Enable warning message.
+        mEnableWarningMessage = arguments.getCharSequence(
+                PrintSettingsFragment.EXTRA_ENABLE_WARNING_MESSAGE);
+
+        // Component name.
+        mComponentName = ComponentName.unflattenFromString(arguments
+                .getString(PrintSettingsFragment.EXTRA_SERVICE_COMPONENT_NAME));
+
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.print_service_settings, menu);
+
+        MenuItem addPrinters = menu.findItem(R.id.print_menu_item_add_printer);
+        if (mServiceEnabled && !TextUtils.isEmpty(mAddPrintersTitle)
+                && mAddPrintersIntent != null) {
+            addPrinters.setIntent(mAddPrintersIntent);
+        } else {
+            menu.removeItem(R.id.print_menu_item_add_printer);
+        }
+
+        MenuItem settings = menu.findItem(R.id.print_menu_item_settings);
+        if (mServiceEnabled && !TextUtils.isEmpty(mSettingsTitle)
+                && mSettingsIntent != null) {
+            settings.setIntent(mSettingsIntent);
+        } else {
+            menu.removeItem(R.id.print_menu_item_settings);
+        }
+
+        MenuItem searchItem = menu.findItem(R.id.print_menu_item_search);
+        if (mServiceEnabled && mPrintersAdapter.getUnfilteredCount() > 0) {
+            SearchView searchView = (SearchView) searchItem.getActionView();
+            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+                @Override
+                public boolean onQueryTextSubmit(String query) {
+                    return true;
+                }
+
+                @Override
+                public boolean onQueryTextChange(String searchString) {
+                    ((Filterable) getListView().getAdapter()).getFilter().filter(searchString);
+                    return true;
+                }
+            });
+            searchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
+                @Override
+                public void onViewAttachedToWindow(View view) {
+                    if (AccessibilityManager.getInstance(getActivity()).isEnabled()) {
+                        view.announceForAccessibility(getString(
+                                R.string.print_search_box_shown_utterance));
+                    }
+                }
+                @Override
+                public void onViewDetachedFromWindow(View view) {
+                    Activity activity = getActivity();
+                    if (activity != null && !activity.isFinishing()
+                            && AccessibilityManager.getInstance(activity).isEnabled()) {
+                        view.announceForAccessibility(getString(
+                                R.string.print_search_box_hidden_utterance));
+                    }
+                }
+            });
+        } else {
+            menu.removeItem(R.id.print_menu_item_search);
+        }
+    }
+
+    private ToggleSwitch createAndAddActionBarToggleSwitch(Activity activity) {
+        ToggleSwitch toggleSwitch = new ToggleSwitch(activity);
+        final int padding = activity.getResources().getDimensionPixelSize(
+                R.dimen.action_bar_switch_padding);
+        toggleSwitch.setPaddingRelative(0, 0, padding, 0);
+        activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                ActionBar.DISPLAY_SHOW_CUSTOM);
+        activity.getActionBar().setCustomView(toggleSwitch,
+                new ActionBar.LayoutParams(ActionBar.LayoutParams.WRAP_CONTENT,
+                        ActionBar.LayoutParams.WRAP_CONTENT,
+                        Gravity.CENTER_VERTICAL | Gravity.END));
+        return toggleSwitch;
+    }
+
+    private static abstract class SettingsContentObserver extends ContentObserver {
+
+        public SettingsContentObserver(Handler handler) {
+            super(handler);
+        }
+
+        public void register(ContentResolver contentResolver) {
+            contentResolver.registerContentObserver(Settings.Secure.getUriFor(
+                    Settings.Secure.ENABLED_PRINT_SERVICES), false, this);
+        }
+
+        public void unregister(ContentResolver contentResolver) {
+            contentResolver.unregisterContentObserver(this);
+        }
+
+        @Override
+        public abstract void onChange(boolean selfChange, Uri uri);
+    }
+
+    private final class AnnounceFilterResult implements Runnable {
+        private static final int SEARCH_RESULT_ANNOUNCEMENT_DELAY = 1000; // 1 sec
+
+        public void post() {
+            remove();
+            getListView().postDelayed(this, SEARCH_RESULT_ANNOUNCEMENT_DELAY);
+        }
+
+        public void remove() {
+            getListView().removeCallbacks(this);
+        }
+
+        @Override
+        public void run() {
+            final int count = getListView().getAdapter().getCount();
+            final String text;
+            if (count <= 0) {
+                text = getString(R.string.print_no_printers_found);
+            } else {
+                text = getActivity().getResources().getQuantityString(
+                    R.plurals.print_search_result_count_utterance, count, count);
+            }
+            getListView().announceForAccessibility(text);
+        }
+    }
+
+    private void announceSearchResult() {
+        if (mAnnounceFilterResult == null) {
+            mAnnounceFilterResult = new AnnounceFilterResult();
+        }
+        mAnnounceFilterResult.post();
+    }
+
+    private final class PrintersAdapter extends BaseAdapter
+            implements LoaderManager.LoaderCallbacks<List<PrinterInfo>>, Filterable {
+        private final Object mLock = new Object();
+
+        private final List<PrinterInfo> mPrinters = new ArrayList<PrinterInfo>();
+
+        private final List<PrinterInfo> mFilteredPrinters = new ArrayList<PrinterInfo>();
+
+        private CharSequence mLastSearchString;
+
+        public void enable() {
+            getLoaderManager().initLoader(LOADER_ID_PRINTERS_LOADER, null, this);
+        }
+
+        public void disable() {
+            getLoaderManager().destroyLoader(LOADER_ID_PRINTERS_LOADER);
+            mPrinters.clear();
+        }
+
+        public int getUnfilteredCount() {
+            return mPrinters.size();
+        }
+
+        @Override
+        public Filter getFilter() {
+            return new Filter() {
+                @Override
+                protected FilterResults performFiltering(CharSequence constraint) {
+                    synchronized (mLock) {
+                        if (TextUtils.isEmpty(constraint)) {
+                            return null;
+                        }
+                        FilterResults results = new FilterResults();
+                        List<PrinterInfo> filteredPrinters = new ArrayList<PrinterInfo>();
+                        String constraintLowerCase = constraint.toString().toLowerCase();
+                        final int printerCount = mPrinters.size();
+                        for (int i = 0; i < printerCount; i++) {
+                            PrinterInfo printer = mPrinters.get(i);
+                            if (printer.getName().toLowerCase().contains(constraintLowerCase)) {
+                                filteredPrinters.add(printer);
+                            }
+                        }
+                        results.values = filteredPrinters;
+                        results.count = filteredPrinters.size();
+                        return results;
+                    }
+                }
+
+                @Override
+                @SuppressWarnings("unchecked")
+                protected void publishResults(CharSequence constraint, FilterResults results) {
+                    final boolean resultCountChanged;
+                    synchronized (mLock) {
+                        final int oldPrinterCount = mFilteredPrinters.size();
+                        mLastSearchString = constraint;
+                        mFilteredPrinters.clear();
+                        if (results == null) {
+                            mFilteredPrinters.addAll(mPrinters);
+                        } else {
+                            List<PrinterInfo> printers = (List<PrinterInfo>) results.values;
+                            mFilteredPrinters.addAll(printers);
+                        }
+                        resultCountChanged = (oldPrinterCount != mFilteredPrinters.size());
+                    }
+                    if (resultCountChanged) {
+                        announceSearchResult();
+                    }
+                    notifyDataSetChanged();
+                }
+            };
+        }
+
+        @Override
+        public int getCount() {
+            synchronized (mLock) {
+                return mFilteredPrinters.size();
+            }
+        }
+
+        @Override
+        public Object getItem(int position) {
+            synchronized (mLock) {
+                return mFilteredPrinters.get(position);
+            }
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            if (convertView == null) {
+                convertView = getActivity().getLayoutInflater().inflate(
+                        R.layout.printer_dropdown_item, parent, false);
+            }
+
+            PrinterInfo printer = (PrinterInfo) getItem(position);
+            CharSequence title = printer.getName();
+            CharSequence subtitle = null;
+            Drawable icon = null;
+            try {
+                PackageInfo packageInfo = getPackageManager().getPackageInfo(
+                        printer.getId().getServiceName().getPackageName(), 0);
+                        subtitle = packageInfo.applicationInfo.loadLabel(getPackageManager());
+                        icon = packageInfo.applicationInfo.loadIcon(getPackageManager());
+            } catch (NameNotFoundException nnfe) {
+                /* ignore */
+            }
+
+            TextView titleView = (TextView) convertView.findViewById(R.id.title);
+            titleView.setText(title);
+
+            TextView subtitleView = (TextView) convertView.findViewById(R.id.subtitle);
+            if (!TextUtils.isEmpty(subtitle)) {
+                subtitleView.setText(subtitle);
+                subtitleView.setVisibility(View.VISIBLE);
+            } else {
+                subtitleView.setText(null);
+                subtitleView.setVisibility(View.GONE);
+            }
+
+            ImageView iconView = (ImageView) convertView.findViewById(R.id.icon);
+            if (icon != null) {
+                iconView.setImageDrawable(icon);
+                iconView.setVisibility(View.VISIBLE);
+            } else {
+                iconView.setVisibility(View.GONE);
+            }
+
+            return convertView;
+        }
+
+        @Override
+        public boolean isEnabled(int position) {
+            return false;
+        }
+
+        @Override
+        public Loader<List<PrinterInfo>> onCreateLoader(int id, Bundle args) {
+            if (id == LOADER_ID_PRINTERS_LOADER) {
+                return new PrintersLoader(getActivity());
+            }
+            return null;
+        }
+
+        @Override
+        public void onLoadFinished(Loader<List<PrinterInfo>> loader,
+                List<PrinterInfo> printers) {
+            synchronized (mLock) {
+                mPrinters.clear();
+                final int printerCount = printers.size();
+                for (int i = 0; i < printerCount; i++) {
+                    PrinterInfo printer = printers.get(i);
+                    if (printer.getId().getServiceName().equals(mComponentName)) {
+                        mPrinters.add(printer);
+                    }
+                }
+                mFilteredPrinters.clear();
+                mFilteredPrinters.addAll(mPrinters);
+                if (!TextUtils.isEmpty(mLastSearchString)) {
+                    getFilter().filter(mLastSearchString);
+                }
+            }
+            notifyDataSetChanged();
+        }
+
+        @Override
+        public void onLoaderReset(Loader<List<PrinterInfo>> loader) {
+            synchronized (mLock) {
+                mPrinters.clear();
+                mFilteredPrinters.clear();
+                mLastSearchString = null;
+            }
+            notifyDataSetInvalidated();
+        }
+    }
+
+    private static class PrintersLoader extends Loader<List<PrinterInfo>> {
+
+        private static final String LOG_TAG = "PrintersLoader";
+
+        private static final boolean DEBUG = false;
+
+        private final Map<PrinterId, PrinterInfo> mPrinters =
+                new LinkedHashMap<PrinterId, PrinterInfo>();
+
+        private PrinterDiscoverySession mDiscoverySession;
+
+        public PrintersLoader(Context context) {
+            super(context);
+        }
+
+        @Override
+        public void deliverResult(List<PrinterInfo> printers) {
+            if (isStarted()) {
+                super.deliverResult(printers);
+            }
+        }
+
+        @Override
+        protected void onStartLoading() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onStartLoading()");
+            }
+            // The contract is that if we already have a valid,
+            // result the we have to deliver it immediately.
+            if (!mPrinters.isEmpty()) {
+                deliverResult(new ArrayList<PrinterInfo>(mPrinters.values()));
+            }
+            // We want to start discovery at this point.
+            onForceLoad();
+        }
+
+        @Override
+        protected void onStopLoading() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onStopLoading()");
+            }
+            onCancelLoad();
+        }
+
+        @Override
+        protected void onForceLoad() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onForceLoad()");
+            }
+            loadInternal();
+        }
+
+        @Override
+        protected boolean onCancelLoad() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onCancelLoad()");
+            }
+            return cancelInternal();
+        }
+
+        @Override
+        protected void onReset() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onReset()");
+            }
+            onStopLoading();
+            mPrinters.clear();
+            if (mDiscoverySession != null) {
+                mDiscoverySession.destroy();
+                mDiscoverySession = null;
+            }
+        }
+
+        @Override
+        protected void onAbandon() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onAbandon()");
+            }
+            onStopLoading();
+        }
+
+        private boolean cancelInternal() {
+            if (mDiscoverySession != null
+                    && mDiscoverySession.isPrinterDiscoveryStarted()) {
+                mDiscoverySession.stopPrinterDiscovery();
+                return true;
+            }
+            return false;
+        }
+
+        private void loadInternal() {
+            if (mDiscoverySession == null) {
+                PrintManager printManager = (PrintManager) getContext()
+                        .getSystemService(Context.PRINT_SERVICE);
+                mDiscoverySession = printManager.createPrinterDiscoverySession();
+                mDiscoverySession.setOnPrintersChangeListener(new OnPrintersChangeListener() {
+                    @Override
+                    public void onPrintersChanged() {
+                        deliverResult(new ArrayList<PrinterInfo>(
+                                mDiscoverySession.getPrinters()));
+                    }
+                });
+            }
+            mDiscoverySession.startPrinterDisovery(null);
+        }
+    }
+}
+
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
new file mode 100644
index 00000000000..391d5051cec
--- /dev/null
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -0,0 +1,535 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.print;
+
+import android.app.ActivityManager;
+import android.app.LoaderManager.LoaderCallbacks;
+import android.content.AsyncTaskLoader;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.Loader;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceScreen;
+import android.print.PrintJob;
+import android.print.PrintJobId;
+import android.print.PrintJobInfo;
+import android.print.PrintManager;
+import android.print.PrintManager.PrintJobStateChangeListener;
+import android.printservice.PrintServiceInfo;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.text.format.DateUtils;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Switch;
+import android.widget.TextView;
+
+import com.android.internal.content.PackageMonitor;
+import com.android.settings.DialogCreatable;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Fragment with the top level print settings.
+ */
+public class PrintSettingsFragment extends SettingsPreferenceFragment implements DialogCreatable {
+
+    static final char ENABLED_PRINT_SERVICES_SEPARATOR = ':';
+
+    private static final int LOADER_ID_PRINT_JOBS_LOADER = 1;
+
+    private static final String PRINT_JOBS_CATEGORY = "print_jobs_category";
+    private static final String PRINT_SERVICES_CATEGORY = "print_services_category";
+
+    // Extras passed to sub-fragments.
+    static final String EXTRA_PREFERENCE_KEY = "EXTRA_PREFERENCE_KEY";
+    static final String EXTRA_CHECKED = "EXTRA_CHECKED";
+    static final String EXTRA_TITLE = "EXTRA_TITLE";
+    static final String EXTRA_ENABLE_WARNING_TITLE = "EXTRA_ENABLE_WARNING_TITLE";
+    static final String EXTRA_ENABLE_WARNING_MESSAGE = "EXTRA_ENABLE_WARNING_MESSAGE";
+    static final String EXTRA_SETTINGS_TITLE = "EXTRA_SETTINGS_TITLE";
+    static final String EXTRA_SETTINGS_COMPONENT_NAME = "EXTRA_SETTINGS_COMPONENT_NAME";
+    static final String EXTRA_ADD_PRINTERS_TITLE = "EXTRA_ADD_PRINTERS_TITLE";
+    static final String EXTRA_ADD_PRINTERS_COMPONENT_NAME = "EXTRA_ADD_PRINTERS_COMPONENT_NAME";
+    static final String EXTRA_SERVICE_COMPONENT_NAME = "EXTRA_SERVICE_COMPONENT_NAME";
+
+    static final String EXTRA_PRINT_JOB_ID = "EXTRA_PRINT_JOB_ID";
+
+    private static final String EXTRA_PRINT_SERVICE_COMPONENT_NAME =
+            "EXTRA_PRINT_SERVICE_COMPONENT_NAME";
+
+    private final PackageMonitor mSettingsPackageMonitor = new SettingsPackageMonitor();
+
+    private final Handler mHandler = new Handler() {
+        @Override
+        public void dispatchMessage(Message msg) {
+            updateServicesPreferences();
+        }
+    };
+
+    private final SettingsContentObserver mSettingsContentObserver =
+            new SettingsContentObserver(mHandler) {
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            updateServicesPreferences();
+        }
+    };
+
+    private PreferenceCategory mActivePrintJobsCategory;
+    private PreferenceCategory mPrintServicesCategory;
+
+    private PrintJobsController mPrintJobsController;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        addPreferencesFromResource(R.xml.print_settings);
+
+        mActivePrintJobsCategory = (PreferenceCategory) findPreference(
+                PRINT_JOBS_CATEGORY);
+        mPrintServicesCategory= (PreferenceCategory) findPreference(
+                PRINT_SERVICES_CATEGORY);
+        getPreferenceScreen().removePreference(mActivePrintJobsCategory);
+
+        mPrintJobsController = new PrintJobsController();
+        getActivity().getLoaderManager().initLoader(LOADER_ID_PRINT_JOBS_LOADER,
+                null, mPrintJobsController);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
+        mSettingsContentObserver.register(getContentResolver());
+        updateServicesPreferences();
+        setHasOptionsMenu(true);
+        startSubSettingsIfNeeded();
+    }
+
+    @Override
+    public void onPause() {
+        mSettingsPackageMonitor.unregister();
+        mSettingsContentObserver.unregister(getContentResolver());
+        super.onPause();
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        String searchUri = Settings.Secure.getString(getContentResolver(),
+                Settings.Secure.PRINT_SERVICE_SEARCH_URI);
+        if (!TextUtils.isEmpty(searchUri)) {
+            MenuItem menuItem = menu.add(R.string.print_menu_item_add_service);
+            menuItem.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            menuItem.setIntent(new Intent(Intent.ACTION_VIEW,Uri.parse(searchUri)));
+        }
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        ViewGroup contentRoot = (ViewGroup) getListView().getParent();
+        View emptyView = getActivity().getLayoutInflater().inflate(
+                    R.layout.empty_print_state, contentRoot, false);
+        TextView textView = (TextView) emptyView.findViewById(R.id.message);
+        textView.setText(R.string.print_no_services_installed);
+        contentRoot.addView(emptyView);
+        getListView().setEmptyView(emptyView);
+    }
+
+    private void updateServicesPreferences() {
+        if (getPreferenceScreen().findPreference(PRINT_SERVICES_CATEGORY) == null) {
+            getPreferenceScreen().addPreference(mPrintServicesCategory);
+        } else {
+            // Since services category is auto generated we have to do a pass
+            // to generate it since services can come and go.
+            mPrintServicesCategory.removeAll();
+        }
+
+        List<ComponentName> enabledServices = SettingsUtils
+                .readEnabledPrintServices(getActivity());
+
+        List<ResolveInfo> installedServices = getActivity().getPackageManager()
+                .queryIntentServices(
+                        new Intent(android.printservice.PrintService.SERVICE_INTERFACE),
+                        PackageManager.GET_SERVICES | PackageManager.GET_META_DATA);
+
+        final int installedServiceCount = installedServices.size();
+        for (int i = 0; i < installedServiceCount; i++) {
+            ResolveInfo installedService = installedServices.get(i);
+
+            PreferenceScreen preference = getPreferenceManager().createPreferenceScreen(
+                    getActivity());
+
+            String title = installedService.loadLabel(getPackageManager()).toString();
+            preference.setTitle(title);
+
+            ComponentName componentName = new ComponentName(
+                    installedService.serviceInfo.packageName,
+                    installedService.serviceInfo.name);
+            preference.setKey(componentName.flattenToString());
+
+            preference.setOrder(i);
+            preference.setFragment(PrintServiceSettingsFragment.class.getName());
+            preference.setPersistent(false);
+
+            final boolean serviceEnabled = enabledServices.contains(componentName);
+            if (serviceEnabled) {
+                preference.setSummary(getString(R.string.print_feature_state_on));
+            } else {
+                preference.setSummary(getString(R.string.print_feature_state_off));
+            }
+
+            Bundle extras = preference.getExtras();
+            extras.putString(EXTRA_PREFERENCE_KEY, preference.getKey());
+            extras.putBoolean(EXTRA_CHECKED, serviceEnabled);
+            extras.putString(EXTRA_TITLE, title);
+
+            PrintServiceInfo printServiceInfo = PrintServiceInfo.create(
+                    installedService, getActivity());
+
+            CharSequence applicationLabel = installedService.loadLabel(getPackageManager());
+
+            extras.putString(EXTRA_ENABLE_WARNING_TITLE, getString(
+                    R.string.print_service_security_warning_title, applicationLabel));
+            extras.putString(EXTRA_ENABLE_WARNING_MESSAGE, getString(
+                    R.string.print_service_security_warning_summary, applicationLabel));
+
+            String settingsClassName = printServiceInfo.getSettingsActivityName();
+            if (!TextUtils.isEmpty(settingsClassName)) {
+                extras.putString(EXTRA_SETTINGS_TITLE,
+                        getString(R.string.print_menu_item_settings));
+                extras.putString(EXTRA_SETTINGS_COMPONENT_NAME,
+                        new ComponentName(installedService.serviceInfo.packageName,
+                                settingsClassName).flattenToString());
+            }
+
+            String addPrinterClassName = printServiceInfo.getAddPrintersActivityName();
+            if (!TextUtils.isEmpty(addPrinterClassName)) {
+                extras.putString(EXTRA_ADD_PRINTERS_TITLE,
+                        getString(R.string.print_menu_item_add_printers));
+                extras.putString(EXTRA_ADD_PRINTERS_COMPONENT_NAME,
+                        new ComponentName(installedService.serviceInfo.packageName,
+                                addPrinterClassName).flattenToString());
+            }
+
+            extras.putString(EXTRA_SERVICE_COMPONENT_NAME, componentName.flattenToString());
+
+            mPrintServicesCategory.addPreference(preference);
+        }
+
+        if (mPrintServicesCategory.getPreferenceCount() == 0) {
+            getPreferenceScreen().removePreference(mPrintServicesCategory);
+        }
+    }
+
+    private void startSubSettingsIfNeeded() {
+        if (getArguments() == null) {
+            return;
+        }
+        String componentName = getArguments().getString(EXTRA_PRINT_SERVICE_COMPONENT_NAME);
+        if (componentName != null) {
+            getArguments().remove(EXTRA_PRINT_SERVICE_COMPONENT_NAME);
+            Preference prereference = findPreference(componentName);
+            if (prereference != null) {
+                prereference.performClick(getPreferenceScreen());
+            }
+        }
+    }
+
+    private class SettingsPackageMonitor extends PackageMonitor {
+        @Override
+        public void onPackageAdded(String packageName, int uid) {
+           mHandler.obtainMessage().sendToTarget();
+        }
+
+        @Override
+        public void onPackageAppeared(String packageName, int reason) {
+            mHandler.obtainMessage().sendToTarget();
+        }
+
+        @Override
+        public void onPackageDisappeared(String packageName, int reason) {
+            mHandler.obtainMessage().sendToTarget();
+        }
+
+        @Override
+        public void onPackageRemoved(String packageName, int uid) {
+            mHandler.obtainMessage().sendToTarget();
+        }
+    }
+
+    public static class ToggleSwitch extends Switch {
+
+        private OnBeforeCheckedChangeListener mOnBeforeListener;
+
+        public static interface OnBeforeCheckedChangeListener {
+            public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked);
+        }
+
+        public ToggleSwitch(Context context) {
+            super(context);
+        }
+
+        public void setOnBeforeCheckedChangeListener(OnBeforeCheckedChangeListener listener) {
+            mOnBeforeListener = listener;
+        }
+
+        @Override
+        public void setChecked(boolean checked) {
+            if (mOnBeforeListener != null
+                    && mOnBeforeListener.onBeforeCheckedChanged(this, checked)) {
+                return;
+            }
+            super.setChecked(checked);
+        }
+
+        public void setCheckedInternal(boolean checked) {
+            super.setChecked(checked);
+        }
+    }
+
+    private static abstract class SettingsContentObserver extends ContentObserver {
+
+        public SettingsContentObserver(Handler handler) {
+            super(handler);
+        }
+
+        public void register(ContentResolver contentResolver) {
+            contentResolver.registerContentObserver(Settings.Secure.getUriFor(
+                    Settings.Secure.ENABLED_PRINT_SERVICES), false, this);
+        }
+
+        public void unregister(ContentResolver contentResolver) {
+            contentResolver.unregisterContentObserver(this);
+        }
+
+        @Override
+        public abstract void onChange(boolean selfChange, Uri uri);
+    }
+
+    private final class PrintJobsController implements LoaderCallbacks<List<PrintJobInfo>> {
+
+        @Override
+        public Loader<List<PrintJobInfo>> onCreateLoader(int id, Bundle args) {
+            if (id == LOADER_ID_PRINT_JOBS_LOADER) {
+                return new PrintJobsLoader(getActivity());
+            }
+            return null;
+        }
+
+        @Override
+        public void onLoadFinished(Loader<List<PrintJobInfo>> loader,
+                List<PrintJobInfo> printJobs) {
+            if (printJobs == null || printJobs.isEmpty()) {
+                getPreferenceScreen().removePreference(mActivePrintJobsCategory);
+            } else {
+                if (getPreferenceScreen().findPreference(PRINT_JOBS_CATEGORY) == null) {
+                    getPreferenceScreen().addPreference(mActivePrintJobsCategory);
+                }
+
+                mActivePrintJobsCategory.removeAll();
+
+                final int printJobCount = printJobs.size();
+                for (int i = 0; i < printJobCount; i++) {
+                    PrintJobInfo printJob = printJobs.get(i);
+
+                    PreferenceScreen preference = getPreferenceManager()
+                            .createPreferenceScreen(getActivity());
+
+                    preference.setPersistent(false);
+                    preference.setFragment(PrintJobSettingsFragment.class.getName());
+                    preference.setKey(printJob.getId().flattenToString());
+
+                    switch (printJob.getState()) {
+                        case PrintJobInfo.STATE_QUEUED:
+                        case PrintJobInfo.STATE_STARTED: {
+                            preference.setTitle(getString(
+                                    R.string.print_printing_state_title_template,
+                                    printJob.getLabel()));
+                        } break;
+
+                        case PrintJobInfo.STATE_FAILED: {
+                            preference.setTitle(getString(
+                                    R.string.print_failed_state_title_template,
+                                    printJob.getLabel()));
+                        } break;
+
+                        case PrintJobInfo.STATE_BLOCKED: {
+                            preference.setTitle(getString(
+                                    R.string.print_blocked_state_title_template,
+                                    printJob.getLabel()));
+                        } break;
+                    }
+
+                    preference.setSummary(getString(R.string.print_job_summary,
+                            printJob.getPrinterName(), DateUtils.formatSameDayTime(
+                                    printJob.getCreationTime(), printJob.getCreationTime(),
+                                    DateFormat.SHORT, DateFormat.SHORT)));
+
+                    switch (printJob.getState()) {
+                        case PrintJobInfo.STATE_QUEUED:
+                        case PrintJobInfo.STATE_STARTED: {
+                            preference.setIcon(com.android.internal.R.drawable.ic_print);
+                        } break;
+
+                        case PrintJobInfo.STATE_FAILED:
+                        case PrintJobInfo.STATE_BLOCKED: {
+                            preference.setIcon(com.android.internal.R.drawable.ic_print_error);
+                        } break;
+                    }
+
+                    Bundle extras = preference.getExtras();
+                    extras.putString(EXTRA_PRINT_JOB_ID, printJob.getId().flattenToString());
+
+                    mActivePrintJobsCategory.addPreference(preference);
+                }
+            }
+        }
+
+        @Override
+        public void onLoaderReset(Loader<List<PrintJobInfo>> loader) {
+            getPreferenceScreen().removePreference(mActivePrintJobsCategory);
+        }
+    }
+
+    private static final class PrintJobsLoader extends AsyncTaskLoader<List<PrintJobInfo>> {
+
+        private static final String LOG_TAG = "PrintJobsLoader";
+
+        private static final boolean DEBUG = false;
+
+        private List <PrintJobInfo> mPrintJobs = new ArrayList<PrintJobInfo>();
+
+        private final PrintManager mPrintManager;
+
+        private PrintJobStateChangeListener mPrintJobStateChangeListener;
+
+        public PrintJobsLoader(Context context) {
+            super(context);
+            mPrintManager = ((PrintManager) context.getSystemService(
+                    Context.PRINT_SERVICE)).getGlobalPrintManagerForUser(
+                            ActivityManager.getCurrentUser());
+        }
+
+        @Override
+        public void deliverResult(List<PrintJobInfo> printJobs) {
+            if (isStarted()) {
+                super.deliverResult(printJobs);
+            }
+        }
+
+        @Override
+        protected void onStartLoading() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onStartLoading()");
+            }
+            // If we already have a result, deliver it immediately.
+            if (!mPrintJobs.isEmpty()) {
+                deliverResult(new ArrayList<PrintJobInfo>(mPrintJobs));
+            }
+            // Start watching for changes.
+            if (mPrintJobStateChangeListener == null) {
+                mPrintJobStateChangeListener = new PrintJobStateChangeListener() {
+                    @Override
+                    public void onPrintJobStateChanged(PrintJobId printJobId) {
+                        onForceLoad();
+                    }
+                };
+                mPrintManager.addPrintJobStateChangeListener(
+                        mPrintJobStateChangeListener);
+            }
+            // If the data changed or we have no data - load it now.
+            if (mPrintJobs.isEmpty()) {
+                onForceLoad();
+            }
+        }
+
+        @Override
+        protected void onStopLoading() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onStopLoading()");
+            }
+            // Cancel the load in progress if possible.
+            onCancelLoad();
+        }
+
+        @Override
+        protected void onReset() {
+            if (DEBUG) {
+                Log.i(LOG_TAG, "onReset()");
+            }
+            // Stop loading.
+            onStopLoading();
+            // Clear the cached result.
+            mPrintJobs.clear();
+            // Stop watching for changes.
+            if (mPrintJobStateChangeListener != null) {
+                mPrintManager.removePrintJobStateChangeListener(
+                        mPrintJobStateChangeListener);
+                mPrintJobStateChangeListener = null;
+            }
+        }
+
+        @Override
+        public List<PrintJobInfo> loadInBackground() {
+            List<PrintJobInfo> printJobInfos = null;
+            List<PrintJob> printJobs = mPrintManager.getPrintJobs();
+            final int printJobCount = printJobs.size();
+            for (int i = 0; i < printJobCount; i++) {
+                PrintJobInfo printJob = printJobs.get(i).getInfo();
+                if (shouldShowToUser(printJob)) {
+                    if (printJobInfos == null) {
+                        printJobInfos = new ArrayList<PrintJobInfo>();
+                    }
+                    printJobInfos.add(printJob);
+                }
+            }
+            return printJobInfos;
+        }
+
+        private static boolean shouldShowToUser(PrintJobInfo printJob) {
+            switch (printJob.getState()) {
+                case PrintJobInfo.STATE_QUEUED:
+                case PrintJobInfo.STATE_STARTED:
+                case PrintJobInfo.STATE_BLOCKED:
+                case PrintJobInfo.STATE_FAILED: {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}
diff --git a/src/com/android/settings/print/SettingsUtils.java b/src/com/android/settings/print/SettingsUtils.java
new file mode 100644
index 00000000000..37827e648c0
--- /dev/null
+++ b/src/com/android/settings/print/SettingsUtils.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.print;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.provider.Settings;
+import android.text.TextUtils.SimpleStringSplitter;
+
+import java.util.ArrayList;import java.util.List;
+
+/**
+ * Helper methods for reading and writing to print settings.
+ */
+public class SettingsUtils {
+
+    private static final char ENABLED_PRINT_SERVICES_SEPARATOR = ':';
+
+    private SettingsUtils() {
+        /* do nothing */
+    }
+
+    public static List<ComponentName> readEnabledPrintServices(Context context) {
+        List<ComponentName> enabledServices = new ArrayList<ComponentName>();
+
+        String enabledServicesSetting = Settings.Secure.getString(context
+                .getContentResolver(), Settings.Secure.ENABLED_PRINT_SERVICES);
+        if (enabledServicesSetting == null) {
+            return enabledServices;
+        }
+
+        SimpleStringSplitter colonSplitter = new SimpleStringSplitter(
+                ENABLED_PRINT_SERVICES_SEPARATOR);
+        colonSplitter.setString(enabledServicesSetting);
+
+        while (colonSplitter.hasNext()) {
+            String componentNameString = colonSplitter.next();
+            ComponentName enabledService = ComponentName.unflattenFromString(
+                    componentNameString);
+            enabledServices.add(enabledService);
+        }
+
+        return enabledServices;
+    }
+
+    public static void writeEnabledPrintServices(Context context,
+            List<ComponentName> services) {
+        StringBuilder builder = new StringBuilder();
+        final int serviceCount = services.size();
+        for (int i = 0; i < serviceCount; i++) {
+            ComponentName service = services.get(i);
+            if (builder.length() > 0) {
+                builder.append(ENABLED_PRINT_SERVICES_SEPARATOR);
+            }
+            builder.append(service.flattenToString());
+        }
+        Settings.Secure.putString(context.getContentResolver(),
+                Settings.Secure.ENABLED_PRINT_SERVICES,
+                builder.toString());
+    }
+}
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index 8f83bbc77b6..0ff7f4f9c7e 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -42,6 +42,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Checkable;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -60,6 +61,9 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
     /** Preference key for the TTS rate selection dialog. */
     private static final String KEY_DEFAULT_RATE = "tts_default_rate";
 
+    /** Preference key for the TTS status field. */
+    private static final String KEY_STATUS = "tts_status";
+
     /**
      * Preference key for the engine selection preference.
      */
@@ -75,6 +79,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
     private PreferenceCategory mEnginePreferenceCategory;
     private ListPreference mDefaultRatePref;
     private Preference mPlayExample;
+    private Preference mEngineStatus;
 
     private int mDefaultRate = TextToSpeech.Engine.DEFAULT_RATE;
 
@@ -98,6 +103,20 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
     private TextToSpeech mTts = null;
     private TtsEngines mEnginesHelper = null;
 
+    private String mSampleText = "";
+
+    /**
+     * Default locale used by selected TTS engine, null if not connected to any engine.
+     */
+    private Locale mCurrentDefaultLocale;
+
+    /**
+     * List of available locals of selected TTS engine, as returned by
+     * {@link TextToSpeech.Engine#ACTION_CHECK_TTS_DATA} activity. If empty, then activity
+     * was not yet called.
+     */
+    private List<String> mAvailableStrLocals;
+
     /**
      * The initialization listener used when we are initalizing the settings
      * screen for the first time (as opposed to when a user changes his choice
@@ -131,11 +150,15 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
 
         mPlayExample = findPreference(KEY_PLAY_EXAMPLE);
         mPlayExample.setOnPreferenceClickListener(this);
+        mPlayExample.setEnabled(false);
 
         mEnginePreferenceCategory = (PreferenceCategory) findPreference(
                 KEY_ENGINE_PREFERENCE_SECTION);
         mDefaultRatePref = (ListPreference) findPreference(KEY_DEFAULT_RATE);
 
+        mEngineStatus = findPreference(KEY_STATUS);
+        updateEngineStatus(R.string.tts_status_checking);
+
         mTts = new TextToSpeech(getActivity().getApplicationContext(), mInitListener);
         mEnginesHelper = new TtsEngines(getActivity().getApplicationContext());
 
@@ -143,6 +166,20 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
         initSettings();
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (mTts == null || mCurrentDefaultLocale == null) {
+            return;
+        }
+        Locale ttsDefaultLocale = mTts.getDefaultLanguage();
+        if (mCurrentDefaultLocale != null && !mCurrentDefaultLocale.equals(ttsDefaultLocale)) {
+            updateWidgetState(false);
+            checkDefaultLocale();
+        }
+    }
+
     private void setTtsUtteranceProgressListener() {
         if (mTts == null) {
             return;
@@ -205,6 +242,80 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
         checkVoiceData(mCurrentEngine);
     }
 
+    /**
+     * Called when the TTS engine is initialized.
+     */
+    public void onInitEngine(int status) {
+        if (status == TextToSpeech.SUCCESS) {
+            if (DBG) Log.d(TAG, "TTS engine for settings screen initialized.");
+            checkDefaultLocale();
+        } else {
+            if (DBG) Log.d(TAG, "TTS engine for settings screen failed to initialize successfully.");
+            updateWidgetState(false);
+        }
+    }
+
+    private void checkDefaultLocale() {
+        Locale defaultLocale = mTts.getDefaultLanguage();
+        if (defaultLocale == null) {
+            Log.e(TAG, "Failed to get default language from engine " + mCurrentEngine);
+            updateWidgetState(false);
+            updateEngineStatus(R.string.tts_status_not_supported);
+            return;
+        }
+
+        mCurrentDefaultLocale = defaultLocale;
+
+        int defaultAvailable = mTts.setLanguage(defaultLocale);
+        if (evaluateDefaultLocale()) {
+            getSampleText();
+        }
+    }
+
+    private boolean evaluateDefaultLocale() {
+        // Check if we are connected to the engine, and CHECK_VOICE_DATA returned list
+        // of available languages.
+        if (mCurrentDefaultLocale == null || mAvailableStrLocals == null) {
+            return false;
+        }
+        int defaultAvailable = mTts.setLanguage(mCurrentDefaultLocale);
+
+        // Check if language is listed in CheckVoices Action result as available voice.
+        String defaultLocaleStr = mCurrentDefaultLocale.getISO3Language();
+        boolean notInAvailableLangauges = true;
+        if (!TextUtils.isEmpty(mCurrentDefaultLocale.getISO3Country())) {
+            defaultLocaleStr += "-" + mCurrentDefaultLocale.getISO3Country();
+        }
+        if (!TextUtils.isEmpty(mCurrentDefaultLocale.getVariant())) {
+            defaultLocaleStr += "-" + mCurrentDefaultLocale.getVariant();
+        }
+
+        for (String loc : mAvailableStrLocals) {
+            if (loc.equalsIgnoreCase(defaultLocaleStr)) {
+              notInAvailableLangauges = false;
+              break;
+            }
+        }
+
+        if (defaultAvailable == TextToSpeech.LANG_NOT_SUPPORTED ||
+                defaultAvailable == TextToSpeech.LANG_MISSING_DATA ||
+                notInAvailableLangauges) {
+            if (DBG) Log.d(TAG, "Default locale for this TTS engine is not supported.");
+            updateEngineStatus(R.string.tts_status_not_supported);
+            updateWidgetState(false);
+            return false;
+        } else {
+            if (isNetworkRequiredForSynthesis()) {
+                updateEngineStatus(R.string.tts_status_requires_network);
+            } else {
+                updateEngineStatus(R.string.tts_status_ok);
+            }
+            updateWidgetState(true);
+            return true;
+        }
+    }
+
+
     /**
      * Ask the current default engine to return a string of sample text to be
      * spoken to the user.
@@ -214,23 +325,15 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
 
         if (TextUtils.isEmpty(currentEngine)) currentEngine = mTts.getDefaultEngine();
 
-
-        Locale defaultLocale = mTts.getDefaultLanguage();
-        if (defaultLocale == null) {
-            Log.e(TAG, "Failed to get default language from engine " + currentEngine);
-            return;
-        }
-        mTts.setLanguage(defaultLocale);
-
         // TODO: This is currently a hidden private API. The intent extras
         // and the intent action should be made public if we intend to make this
         // a public API. We fall back to using a canned set of strings if this
         // doesn't work.
         Intent intent = new Intent(TextToSpeech.Engine.ACTION_GET_SAMPLE_TEXT);
 
-        intent.putExtra("language", defaultLocale.getLanguage());
-        intent.putExtra("country", defaultLocale.getCountry());
-        intent.putExtra("variant", defaultLocale.getVariant());
+        intent.putExtra("language", mCurrentDefaultLocale.getLanguage());
+        intent.putExtra("country", mCurrentDefaultLocale.getCountry());
+        intent.putExtra("variant", mCurrentDefaultLocale.getVariant());
         intent.setPackage(currentEngine);
 
         try {
@@ -241,19 +344,6 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
         }
     }
 
-    /**
-     * Called when the TTS engine is initialized.
-     */
-    public void onInitEngine(int status) {
-        if (status == TextToSpeech.SUCCESS) {
-            updateWidgetState(true);
-            if (DBG) Log.d(TAG, "TTS engine for settings screen initialized.");
-        } else {
-            if (DBG) Log.d(TAG, "TTS engine for settings screen failed to initialize successfully.");
-            updateWidgetState(false);
-        }
-    }
-
     /**
      * Called when voice data integrity check returns
      */
@@ -280,11 +370,14 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
                 }
             }
         }
-        return null;
+        return getString(R.string.tts_default_sample_string);
     }
 
     private boolean isNetworkRequiredForSynthesis() {
-        Set<String> features = mTts.getFeatures(mTts.getLanguage());
+        Set<String> features = mTts.getFeatures(mCurrentDefaultLocale);
+        if (features == null) {
+          return false;
+        }
         return features.contains(TextToSpeech.Engine.KEY_FEATURE_NETWORK_SYNTHESIS) &&
                 !features.contains(TextToSpeech.Engine.KEY_FEATURE_EMBEDDED_SYNTHESIS);
     }
@@ -301,24 +394,25 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
             if (DBG) Log.d(TAG, "Using default sample text :" + sample);
         }
 
-        if (sample != null && mTts != null) {
-            // The engine is guaranteed to have been initialized here
-            // because this preference is not enabled otherwise.
-
-            final boolean networkRequired = isNetworkRequiredForSynthesis();
-            if (!networkRequired || networkRequired &&
-                    (mTts.isLanguageAvailable(mTts.getLanguage()) >= TextToSpeech.LANG_AVAILABLE)) {
-                HashMap<String, String> params = new HashMap<String, String>();
-                params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, "Sample");
-
-                mTts.speak(sample, TextToSpeech.QUEUE_FLUSH, params);
-            } else {
-                Log.w(TAG, "Network required for sample synthesis for requested language");
-                displayNetworkAlert();
-            }
+        mSampleText = sample;
+        if (mSampleText != null) {
+            updateWidgetState(true);
         } else {
-            // TODO: Display an error here to the user.
-            Log.e(TAG, "Did not have a sample string for the requested language");
+            Log.e(TAG, "Did not have a sample string for the requested language. Using default");
+        }
+    }
+
+    private void speakSampleText() {
+        final boolean networkRequired = isNetworkRequiredForSynthesis();
+        if (!networkRequired || networkRequired &&
+                (mTts.isLanguageAvailable(mCurrentDefaultLocale) >= TextToSpeech.LANG_AVAILABLE)) {
+            HashMap<String, String> params = new HashMap<String, String>();
+            params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, "Sample");
+
+            mTts.speak(mSampleText, TextToSpeech.QUEUE_FLUSH, params);
+        } else {
+            Log.w(TAG, "Network required for sample synthesis for requested language");
+            displayNetworkAlert();
         }
     }
 
@@ -349,7 +443,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
         if (preference == mPlayExample) {
             // Get the sample text from the TTS engine; onActivityResult will do
             // the actual speaking
-            getSampleText();
+            speakSampleText();
             return true;
         }
 
@@ -359,6 +453,15 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
     private void updateWidgetState(boolean enable) {
         mPlayExample.setEnabled(enable);
         mDefaultRatePref.setEnabled(enable);
+        mEngineStatus.setEnabled(enable);
+    }
+
+    private void updateEngineStatus(int resourceId) {
+        Locale locale = mCurrentDefaultLocale;
+        if (locale == null) {
+            locale = Locale.getDefault();
+        }
+        mEngineStatus.setSummary(getString(resourceId, locale.getDisplayName()));
     }
 
     private void displayNetworkAlert() {
@@ -379,6 +482,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
         // Disable the "play sample text" preference and the speech
         // rate preference while the engine is being swapped.
         updateWidgetState(false);
+        updateEngineStatus(R.string.tts_status_checking);
 
         // Keep track of the previous engine that was being used. So that
         // we can reuse the previous engine.
@@ -463,6 +567,17 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
 
         Settings.Secure.putString(getContentResolver(), TTS_DEFAULT_SYNTH, engine);
 
+        mAvailableStrLocals = data.getStringArrayListExtra(
+            TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES);
+        if (mAvailableStrLocals == null) {
+            Log.e(TAG, "Voice data check complete, but no available voices found");
+            // Set mAvailableStrLocals to empty list
+            mAvailableStrLocals = new ArrayList<String>();
+        }
+        if (evaluateDefaultLocale()) {
+            getSampleText();
+        }
+
         final int engineCount = mEnginePreferenceCategory.getPreferenceCount();
         for (int i = 0; i < engineCount; ++i) {
             final Preference p = mEnginePreferenceCategory.getPreference(i);
@@ -474,8 +589,6 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
                 }
             }
         }
-
-        updateWidgetState(true);
     }
 
     @Override
diff --git a/src/com/android/settings/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
index e02b6ae13ff..bb5ac7ae4c0 100644
--- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java
+++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
@@ -22,6 +22,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
@@ -62,6 +63,9 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem
 
     private TextToSpeech mTts;
 
+    private int mSelectedLocaleIndex = -1;
+    private int mSystemLocaleIndex = -1;
+
     private final TextToSpeech.OnInitListener mTtsInitListener = new TextToSpeech.OnInitListener() {
         @Override
         public void onInit(int status) {
@@ -105,10 +109,6 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem
         mEngineSettingsPreference.setOnPreferenceClickListener(this);
         mInstallVoicesPreference = root.findPreference(KEY_INSTALL_DATA);
         mInstallVoicesPreference.setOnPreferenceClickListener(this);
-        // Remove this preference unless voices are indeed available to install.
-        root.removePreference(mInstallVoicesPreference);
-        // Remove this preference unless locales are indeed available.
-        root.removePreference(mLocalePreference);
 
         root.setTitle(getEngineLabel());
         root.setKey(getEngineName());
@@ -120,8 +120,8 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem
             mEngineSettingsPreference.setEnabled(false);
         }
         mInstallVoicesPreference.setEnabled(false);
-
         mLocalePreference.setEnabled(false);
+
         mLocalePreference.setEntries(new CharSequence[0]);
         mLocalePreference.setEntryValues(new CharSequence[0]);
 
@@ -130,7 +130,6 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem
         mTts = new TextToSpeech(getActivity().getApplicationContext(), mTtsInitListener,
                 getEngineName());
 
-
         // Check if data packs changed
         checkTtsData();
 
@@ -172,31 +171,26 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem
         final ArrayList<String> unavailable = mVoiceDataDetails.getStringArrayListExtra(
                 TextToSpeech.Engine.EXTRA_UNAVAILABLE_VOICES);
 
+        if (unavailable != null && unavailable.size() > 0) {
+            mInstallVoicesPreference.setEnabled(true);
+        } else {
+            mInstallVoicesPreference.setEnabled(false);
+        }
+
         if (available == null){
             Log.e(TAG, "TTS data check failed (available == null).");
             mLocalePreference.setEnabled(false);
-            getPreferenceScreen().removePreference(mLocalePreference);
             return;
-        }
-
-        if (unavailable != null && unavailable.size() > 0) {
-            mInstallVoicesPreference.setEnabled(true);
-            getPreferenceScreen().addPreference(mInstallVoicesPreference);
         } else {
-            getPreferenceScreen().removePreference(mInstallVoicesPreference);
-        }
-
-        if (available.size() > 0) {
-            mLocalePreference.setEnabled(true);
-            getPreferenceScreen().addPreference(mLocalePreference);
             updateDefaultLocalePref(available);
-        } else {
-            mLocalePreference.setEnabled(false);
-            getPreferenceScreen().removePreference(mLocalePreference);
         }
     }
 
     private void updateDefaultLocalePref(ArrayList<String> availableLangs) {
+        if (availableLangs == null || availableLangs.size() == 0) {
+            mLocalePreference.setEnabled(false);
+            return;
+        }
         String currentLocale = mEnginesHelper.getLocalePrefForEngine(
                 getEngineName());
 
@@ -227,14 +221,20 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem
             }
         });
 
+        String defaultLocaleStr = mEnginesHelper.getDefaultLocale();
+
         // Get two arrays out of one of pairs
-        int selectedLanguageIndex = -1;
+        mSelectedLocaleIndex = -1;
+        mSystemLocaleIndex = -1;
         CharSequence[] entries = new CharSequence[availableLangs.size()];
         CharSequence[] entryValues = new CharSequence[availableLangs.size()];
         int i = 0;
         for (Pair<String, String> entry : entryPairs) {
             if (entry.second.equalsIgnoreCase(currentLocale)) {
-                selectedLanguageIndex = i;
+                mSelectedLocaleIndex = i;
+            }
+            if (entry.second.equalsIgnoreCase(defaultLocaleStr)) {
+                mSystemLocaleIndex = i;
             }
             entries[i] = entry.first;
             entryValues[i++] = entry.second;
@@ -242,11 +242,18 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem
 
         mLocalePreference.setEntries(entries);
         mLocalePreference.setEntryValues(entryValues);
-        if (selectedLanguageIndex > -1) {
-            mLocalePreference.setValueIndex(selectedLanguageIndex);
+        mLocalePreference.setEnabled(true);
+        setLocalePreference(mSelectedLocaleIndex);
+    }
+
+    /** Set entry from entry table in mLocalePreference */
+    private void setLocalePreference(int index) {
+        if (index < 0) {
+            mLocalePreference.setValue("");
+            mLocalePreference.setSummary(R.string.tts_lang_not_selected);
         } else {
-            mLocalePreference.setValueIndex(0);
-            updateLanguageTo(availableLangs.get(0));
+            mLocalePreference.setValueIndex(index);
+            mLocalePreference.setSummary(mLocalePreference.getEntries()[index]);
         }
     }
 
@@ -286,12 +293,32 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem
             updateLanguageTo((String) newValue);
             return true;
         }
-
         return false;
     }
 
     private void updateLanguageTo(String locale) {
-        mEnginesHelper.updateLocalePrefForEngine(getEngineName(), locale);
+        int selectedLocaleIndex = -1;
+        for (int i=0; i < mLocalePreference.getEntryValues().length; i++) {
+            if (locale.equalsIgnoreCase(mLocalePreference.getEntryValues()[i].toString())) {
+                selectedLocaleIndex = i;
+                break;
+            }
+        }
+
+        if (selectedLocaleIndex == -1) {
+            Log.w(TAG, "updateLanguageTo called with unknown locale argument");
+            return;
+        }
+        mLocalePreference.setSummary(mLocalePreference.getEntries()[selectedLocaleIndex]);
+        mSelectedLocaleIndex = selectedLocaleIndex;
+
+        if (mSelectedLocaleIndex == mSystemLocaleIndex) {
+            // Use empty locale, it will default to the system language
+            mEnginesHelper.updateLocalePrefForEngine(getEngineName(), "");
+        } else {
+            mEnginesHelper.updateLocalePrefForEngine(getEngineName(), locale);
+        }
+
         if (getEngineName().equals(mTts.getCurrentEngine())) {
             String[] localeArray = TtsEngines.parseLocalePref(locale);
             if (localeArray != null) {
@@ -307,5 +334,4 @@ public class TtsEngineSettingsFragment extends SettingsPreferenceFragment implem
     private String getEngineLabel() {
         return getArguments().getString(TtsEnginePreference.FRAGMENT_ARGS_LABEL);
     }
-
 }
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index 95d3496ad71..f1022b9a2eb 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -17,14 +17,10 @@
 package com.android.settings.users;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.AppGlobals;
-import android.app.Dialog;
-import android.app.Fragment;
 import android.appwidget.AppWidgetManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.RestrictionEntry;
@@ -34,16 +30,12 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
 import android.content.res.Resources;
-import android.database.Cursor;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.ColorFilter;
 import android.graphics.ColorMatrix;
 import android.graphics.ColorMatrixColorFilter;
 import android.graphics.drawable.Drawable;
-import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.RemoteException;
@@ -58,33 +50,21 @@ import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceGroup;
 import android.preference.SwitchPreference;
-import android.provider.ContactsContract.DisplayPhoto;
-import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.inputmethod.InputMethod;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
+import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.ListAdapter;
-import android.widget.ListPopupWindow;
 import android.widget.Switch;
-import android.widget.TextView;
 
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -103,13 +83,12 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
     private static final boolean DEBUG = false;
 
     private static final String PKG_PREFIX = "pkg_";
-    private static final String KEY_USER_INFO = "user_info";
 
-    private static final int DIALOG_ID_EDIT_USER_INFO = 1;
-
-    private PackageManager mPackageManager;
-    private UserManager mUserManager;
-    private UserHandle mUser;
+    protected PackageManager mPackageManager;
+    protected UserManager mUserManager;
+    protected IPackageManager mIPm;
+    protected UserHandle mUser;
+    private PackageInfo mSysPackageInfo;
 
     private PreferenceGroup mAppList;
 
@@ -123,27 +102,21 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
     /** Key for extra passed in from calling fragment to indicate if this is a newly created user */
     public static final String EXTRA_NEW_USER = "new_user";
 
-    private static final String KEY_SAVED_PHOTO = "pending_photo";
-
     HashMap<String,Boolean> mSelectedPackages = new HashMap<String,Boolean>();
     private boolean mFirstTime = true;
     private boolean mNewUser;
     private boolean mAppListChanged;
+    protected boolean mRestrictedProfile;
+
+    private static final int CUSTOM_REQUEST_CODE_START = 1000;
+    private int mCustomRequestCode = CUSTOM_REQUEST_CODE_START;
 
-    private int mCustomRequestCode;
     private HashMap<Integer, AppRestrictionsPreference> mCustomRequestMap =
             new HashMap<Integer,AppRestrictionsPreference>();
-    private View mHeaderView;
-    private ImageView mUserIconView;
-    private TextView mUserNameView;
 
     private List<SelectableAppInfo> mVisibleApps;
     private List<ApplicationInfo> mUserApps;
-
-    private Dialog mEditUserInfoDialog;
-
-    private EditUserPhotoController mEditUserPhotoController;
-    private Bitmap mSavedPhoto;
+    private AsyncTask mAppLoadingTask;
 
     private BroadcastReceiver mUserBackgrounding = new BroadcastReceiver() {
         @Override
@@ -153,12 +126,19 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
             // have been scheduled during user startup.
             if (mAppListChanged) {
                 if (DEBUG) Log.d(TAG, "User backgrounding, update app list");
-                updateUserAppList();
+                applyUserAppsStates();
                 if (DEBUG) Log.d(TAG, "User backgrounding, done updating app list");
             }
         }
     };
 
+    private BroadcastReceiver mPackageObserver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            onPackageChanged(intent);
+        }
+    };
+
     static class SelectableAppInfo {
         String packageName;
         CharSequence appName;
@@ -177,10 +157,9 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
         private boolean hasSettings;
         private OnClickListener listener;
         private ArrayList<RestrictionEntry> restrictions;
-        boolean panelOpen;
+        private boolean panelOpen;
         private boolean immutable;
-        List<Preference> childPreferences = new ArrayList<Preference>();
-        private SelectableAppInfo appInfo;
+        private List<Preference> mChildren = new ArrayList<Preference>();
         private final ColorFilter grayscaleFilter;
 
         AppRestrictionsPreference(Context context, OnClickListener listener) {
@@ -221,10 +200,6 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
             return immutable;
         }
 
-        void setSelectableAppInfo(SelectableAppInfo appInfo) {
-            this.appInfo = appInfo;
-        }
-
         RestrictionEntry getRestriction(String key) {
             if (restrictions == null) return null;
             for (RestrictionEntry entry : restrictions) {
@@ -239,6 +214,18 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
             return restrictions;
         }
 
+        boolean isPanelOpen() {
+            return panelOpen;
+        }
+
+        void setPanelOpen(boolean open) {
+            panelOpen = open;
+        }
+
+        List<Preference> getChildren() {
+            return mChildren;
+        }
+
         @Override
         protected void onBindView(View view) {
             super.onBindView(view);
@@ -257,139 +244,190 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
             ViewGroup widget = (ViewGroup) view.findViewById(android.R.id.widget_frame);
             widget.setEnabled(!isImmutable());
             if (widget.getChildCount() > 0) {
-                final Switch switchView = (Switch) widget.getChildAt(0);
-                switchView.setEnabled(!isImmutable());
-                switchView.setTag(this);
-                switchView.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+                final Switch toggle = (Switch) widget.getChildAt(0);
+                toggle.setEnabled(!isImmutable());
+                toggle.setTag(this);
+                toggle.setOnCheckedChangeListener(new OnCheckedChangeListener() {
                     @Override
                     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                        listener.onClick(switchView);
+                        listener.onClick(toggle);
                     }
                 });
             }
         }
     }
 
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
+    protected void init(Bundle icicle) {
         if (icicle != null) {
             mUser = new UserHandle(icicle.getInt(EXTRA_USER_ID));
-            mSavedPhoto = (Bitmap) icicle.getParcelable(KEY_SAVED_PHOTO);
         } else {
             Bundle args = getArguments();
-
-            if (args.containsKey(EXTRA_USER_ID)) {
-                mUser = new UserHandle(args.getInt(EXTRA_USER_ID));
+            if (args != null) {
+                if (args.containsKey(EXTRA_USER_ID)) {
+                    mUser = new UserHandle(args.getInt(EXTRA_USER_ID));
+                }
+                mNewUser = args.getBoolean(EXTRA_NEW_USER, false);
             }
-            mNewUser = args.getBoolean(EXTRA_NEW_USER, false);
         }
-        mPackageManager = getActivity().getPackageManager();
-        mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
-        addPreferencesFromResource(R.xml.app_restrictions);
-        mAppList = getPreferenceScreen();
-        setHasOptionsMenu(true);
-    }
 
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        if (mHeaderView == null) {
-            mHeaderView = LayoutInflater.from(getActivity()).inflate(
-                    R.layout.user_info_header, null);
-            ((ViewGroup) getListView().getParent()).addView(mHeaderView, 0);
-            mHeaderView.setOnClickListener(this);
-            mUserIconView = (ImageView) mHeaderView.findViewById(android.R.id.icon);
-            mUserNameView = (TextView) mHeaderView.findViewById(android.R.id.title);
-            getListView().setFastScrollEnabled(true);
+        if (mUser == null) {
+            mUser = android.os.Process.myUserHandle();
         }
-        // This is going to bind the preferences.
-        super.onActivityCreated(savedInstanceState);
+
+        mPackageManager = getActivity().getPackageManager();
+        mIPm = IPackageManager.Stub.asInterface(ServiceManager.getService("package"));
+        mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        mRestrictedProfile = mUserManager.getUserInfo(mUser.getIdentifier()).isRestricted();
+        try {
+            mSysPackageInfo = mPackageManager.getPackageInfo("android",
+                PackageManager.GET_SIGNATURES);
+        } catch (NameNotFoundException nnfe) {
+            // ?
+        }
+        addPreferencesFromResource(R.xml.app_restrictions);
+        mAppList = getAppPreferenceGroup();
     }
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putInt(EXTRA_USER_ID, mUser.getIdentifier());
-        if (mEditUserInfoDialog != null && mEditUserInfoDialog.isShowing()
-                && mEditUserPhotoController != null) {
-            outState.putParcelable(KEY_SAVED_PHOTO,
-                    mEditUserPhotoController.getNewUserPhotoBitmap());
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        getActivity().registerReceiver(mUserBackgrounding,
+                new IntentFilter(Intent.ACTION_USER_BACKGROUND));
+        IntentFilter packageFilter = new IntentFilter();
+        packageFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
+        packageFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+        packageFilter.addDataScheme("package");
+        getActivity().registerReceiver(mPackageObserver, packageFilter);
+
+        mAppListChanged = false;
+        if (mAppLoadingTask == null || mAppLoadingTask.getStatus() == AsyncTask.Status.FINISHED) {
+            mAppLoadingTask = new AppLoadingTask().execute((Void[]) null);
         }
     }
 
-    public void onResume() {
-        super.onResume();
-        getActivity().registerReceiver(mUserBackgrounding,
-                new IntentFilter(Intent.ACTION_USER_BACKGROUND));
-        mAppListChanged = false;
-        new AppLoadingTask().execute((Void[]) null);
-
-        UserInfo info = mUserManager.getUserInfo(mUser.getIdentifier());
-        ((TextView) mHeaderView.findViewById(android.R.id.title)).setText(info.name);
-        ((ImageView) mHeaderView.findViewById(android.R.id.icon)).setImageDrawable(
-                getCircularUserIcon());
-    }
-
+    @Override
     public void onPause() {
         super.onPause();
         mNewUser = false;
         getActivity().unregisterReceiver(mUserBackgrounding);
+        getActivity().unregisterReceiver(mPackageObserver);
         if (mAppListChanged) {
             new Thread() {
                 public void run() {
-                    updateUserAppList();
+                    applyUserAppsStates();
                 }
             }.start();
         }
     }
 
-    private Drawable getCircularUserIcon() {
+    private void onPackageChanged(Intent intent) {
+        String action = intent.getAction();
+        String packageName = intent.getData().getSchemeSpecificPart();
+        // Package added, check if the preference needs to be enabled
+        AppRestrictionsPreference pref = (AppRestrictionsPreference)
+                findPreference(getKeyForPackage(packageName));
+        if (pref == null) return;
+
+        if ((Intent.ACTION_PACKAGE_ADDED.equals(action) && pref.isChecked())
+                || (Intent.ACTION_PACKAGE_REMOVED.equals(action) && !pref.isChecked())) {
+            pref.setEnabled(true);
+        }
+    }
+
+    protected PreferenceGroup getAppPreferenceGroup() {
+        return getPreferenceScreen();
+    }
+
+    protected Drawable getCircularUserIcon() {
         Bitmap userIcon = mUserManager.getUserIcon(mUser.getIdentifier());
+        if (userIcon == null) {
+            return null;
+        }
         CircleFramedDrawable circularIcon =
                 CircleFramedDrawable.getInstance(this.getActivity(), userIcon);
         return circularIcon;
     }
 
-    private void updateUserAppList() {
-        IPackageManager ipm = IPackageManager.Stub.asInterface(
-                ServiceManager.getService("package"));
+    protected void clearSelectedApps() {
+        mSelectedPackages.clear();
+    }
+
+    private void applyUserAppsStates() {
         final int userId = mUser.getIdentifier();
-        if (!mUserManager.getUserInfo(userId).isRestricted()) {
-            Log.e(TAG, "Cannot apply application restrictions on a regular user!");
+        if (!mUserManager.getUserInfo(userId).isRestricted() && userId != UserHandle.myUserId()) {
+            Log.e(TAG, "Cannot apply application restrictions on another user!");
             return;
         }
         for (Map.Entry<String,Boolean> entry : mSelectedPackages.entrySet()) {
             String packageName = entry.getKey();
-            if (entry.getValue()) {
-                // Enable selected apps
-                try {
-                    ApplicationInfo info = ipm.getApplicationInfo(packageName, 0, userId);
-                    if (info == null || info.enabled == false) {
-                        ipm.installExistingPackageAsUser(packageName, mUser.getIdentifier());
-                        if (DEBUG) {
-                            Log.d(TAG, "Installing " + packageName);
-                        }
+            boolean enabled = entry.getValue();
+            applyUserAppState(packageName, enabled);
+        }
+    }
+
+    private void applyUserAppState(String packageName, boolean enabled) {
+        final int userId = mUser.getIdentifier();
+        if (enabled) {
+            // Enable selected apps
+            try {
+                ApplicationInfo info = mIPm.getApplicationInfo(packageName,
+                        PackageManager.GET_UNINSTALLED_PACKAGES, userId);
+                if (info == null || info.enabled == false
+                        || (info.flags&ApplicationInfo.FLAG_INSTALLED) == 0) {
+                    mIPm.installExistingPackageAsUser(packageName, mUser.getIdentifier());
+                    if (DEBUG) {
+                        Log.d(TAG, "Installing " + packageName);
                     }
-                } catch (RemoteException re) {
                 }
-            } else {
-                // Blacklist all other apps, system or downloaded
-                try {
-                    ApplicationInfo info = ipm.getApplicationInfo(packageName, 0, userId);
-                    if (info != null) {
-                        ipm.deletePackageAsUser(entry.getKey(), null, mUser.getIdentifier(),
+                if (info != null && (info.flags&ApplicationInfo.FLAG_BLOCKED) != 0
+                        && (info.flags&ApplicationInfo.FLAG_INSTALLED) != 0) {
+                    disableUiForPackage(packageName);
+                    mIPm.setApplicationBlockedSettingAsUser(packageName, false, userId);
+                    if (DEBUG) {
+                        Log.d(TAG, "Unblocking " + packageName);
+                    }
+                }
+            } catch (RemoteException re) {
+            }
+        } else {
+            // Blacklist all other apps, system or downloaded
+            try {
+                ApplicationInfo info = mIPm.getApplicationInfo(packageName, 0, userId);
+                if (info != null) {
+                    if (mRestrictedProfile) {
+                        mIPm.deletePackageAsUser(packageName, null, mUser.getIdentifier(),
                                 PackageManager.DELETE_SYSTEM_APP);
                         if (DEBUG) {
                             Log.d(TAG, "Uninstalling " + packageName);
                         }
+                    } else {
+                        disableUiForPackage(packageName);
+                        mIPm.setApplicationBlockedSettingAsUser(packageName, true, userId);
+                        if (DEBUG) {
+                            Log.d(TAG, "Blocking " + packageName);
+                        }
                     }
-                } catch (RemoteException re) {
                 }
+            } catch (RemoteException re) {
             }
         }
     }
 
+    private void disableUiForPackage(String packageName) {
+        AppRestrictionsPreference pref = (AppRestrictionsPreference) findPreference(
+                getKeyForPackage(packageName));
+        if (pref != null) {
+            pref.setEnabled(false);
+        }
+    }
+
     private boolean isSystemPackage(String packageName) {
         try {
             final PackageInfo pi = mPackageManager.getPackageInfo(packageName, 0);
@@ -441,16 +479,27 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
         if (getActivity() == null) return;
         final PackageManager pm = mPackageManager;
         List<ResolveInfo> launchableApps = pm.queryIntentActivities(intent,
-                PackageManager.GET_DISABLED_COMPONENTS);
+                PackageManager.GET_DISABLED_COMPONENTS | PackageManager.GET_UNINSTALLED_PACKAGES);
         for (ResolveInfo app : launchableApps) {
             if (app.activityInfo != null && app.activityInfo.applicationInfo != null) {
+                final String packageName = app.activityInfo.packageName;
                 int flags = app.activityInfo.applicationInfo.flags;
                 if ((flags & ApplicationInfo.FLAG_SYSTEM) != 0
                         || (flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
                     // System app
                     // Skip excluded packages
-                    if (excludePackages.contains(app.activityInfo.packageName)) continue;
-
+                    if (excludePackages.contains(packageName)) continue;
+                    int enabled = pm.getApplicationEnabledSetting(packageName);
+                    if (enabled == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
+                            || enabled == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
+                        // Check if the app is already enabled for the target user
+                        ApplicationInfo targetUserAppInfo = getAppInfoForUser(packageName,
+                                0, mUser);
+                        if (targetUserAppInfo == null
+                                || (targetUserAppInfo.flags&ApplicationInfo.FLAG_INSTALLED) == 0) {
+                            continue;
+                        }
+                    }
                     SelectableAppInfo info = new SelectableAppInfo();
                     info.packageName = app.activityInfo.packageName;
                     info.appName = app.activityInfo.applicationInfo.loadLabel(pm);
@@ -464,6 +513,16 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
         }
     }
 
+    private ApplicationInfo getAppInfoForUser(String packageName, int flags, UserHandle user) {
+        try {
+            ApplicationInfo targetUserAppInfo = mIPm.getApplicationInfo(packageName, flags,
+                    user.getIdentifier());
+            return targetUserAppInfo;
+        } catch (RemoteException re) {
+            return null;
+        }
+    }
+
     private class AppLoadingTask extends AsyncTask<Void, Void, Void> {
 
         @Override
@@ -488,7 +547,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
         final Context context = getActivity();
         if (context == null) return;
         final PackageManager pm = mPackageManager;
-        IPackageManager ipm = AppGlobals.getPackageManager();
+        final IPackageManager ipm = mIPm;
 
         final HashSet<String> excludePackages = new HashSet<String>();
         addSystemImes(excludePackages);
@@ -502,8 +561,12 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
         Intent widgetIntent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
         addSystemApps(mVisibleApps, widgetIntent, excludePackages);
 
-        List<ApplicationInfo> installedApps = pm.getInstalledApplications(0);
+        List<ApplicationInfo> installedApps = pm.getInstalledApplications(
+                PackageManager.GET_UNINSTALLED_PACKAGES);
         for (ApplicationInfo app : installedApps) {
+            // If it's not installed, skip
+            if ((app.flags & ApplicationInfo.FLAG_INSTALLED) == 0) continue;
+
             if ((app.flags & ApplicationInfo.FLAG_SYSTEM) == 0
                     && (app.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) == 0) {
                 // Downloaded app
@@ -519,7 +582,8 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
                     // If it's a system app that requires an account and doesn't see restricted
                     // accounts, mark for removal. It might get shown in the UI if it has an icon
                     // but will still be marked as false and immutable.
-                    if (pi.requiredAccountType != null && pi.restrictedAccountType == null) {
+                    if (mRestrictedProfile
+                            && pi.requiredAccountType != null && pi.restrictedAccountType == null) {
                         mSelectedPackages.put(app.packageName, false);
                     }
                 } catch (NameNotFoundException re) {
@@ -527,15 +591,18 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
             }
         }
 
+        // Get the list of apps already installed for the user
         mUserApps = null;
         try {
             mUserApps = ipm.getInstalledApplications(
-                    0, mUser.getIdentifier()).getList();
+                    PackageManager.GET_UNINSTALLED_PACKAGES, mUser.getIdentifier()).getList();
         } catch (RemoteException re) {
         }
 
         if (mUserApps != null) {
             for (ApplicationInfo app : mUserApps) {
+                if ((app.flags & ApplicationInfo.FLAG_INSTALLED) == 0) continue;
+
                 if ((app.flags & ApplicationInfo.FLAG_SYSTEM) == 0
                         && (app.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) == 0) {
                     // Downloaded app
@@ -548,6 +615,8 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
                 }
             }
         }
+
+        // Sort the list of visible apps
         Collections.sort(mVisibleApps, new AppLabelComparator());
 
         // Remove dupes
@@ -576,11 +645,25 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
         }
     }
 
+    private boolean isPlatformSigned(PackageInfo pi) {
+        return (pi != null && pi.signatures != null &&
+                    mSysPackageInfo.signatures[0].equals(pi.signatures[0]));
+    }
+
+    private boolean isAppEnabledForUser(PackageInfo pi) {
+        if (pi == null) return false;
+        final int flags = pi.applicationInfo.flags;
+        // Return true if it is installed and not blocked
+        return ((flags&ApplicationInfo.FLAG_INSTALLED) != 0
+                && (flags&ApplicationInfo.FLAG_BLOCKED) == 0);
+    }
+
     private void populateApps() {
         final Context context = getActivity();
         if (context == null) return;
         final PackageManager pm = mPackageManager;
-        IPackageManager ipm = AppGlobals.getPackageManager();
+        final IPackageManager ipm = mIPm;
+
         mAppList.removeAll();
         Intent restrictionsIntent = new Intent(Intent.ACTION_GET_RESTRICTION_ENTRIES);
         final List<ResolveInfo> receivers = pm.queryBroadcastReceivers(restrictionsIntent, 0);
@@ -599,39 +682,39 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
                     p.setSummary(context.getString(R.string.user_restrictions_controlled_by,
                             app.masterEntry.activityName));
                 }
-                p.setKey(PKG_PREFIX + packageName);
+                p.setKey(getKeyForPackage(packageName));
                 p.setSettingsEnabled(hasSettings || isSettingsApp);
                 p.setPersistent(false);
                 p.setOnPreferenceChangeListener(this);
                 p.setOnPreferenceClickListener(this);
                 PackageInfo pi = null;
                 try {
-                    pi = pm.getPackageInfo(packageName, 0);
-                } catch (NameNotFoundException re) {
-                    try {
-                        pi = ipm.getPackageInfo(packageName, 0, mUser.getIdentifier());
-                    } catch (RemoteException e) {
-                    }
+                    pi = ipm.getPackageInfo(packageName,
+                            PackageManager.GET_UNINSTALLED_PACKAGES
+                            | PackageManager.GET_SIGNATURES, mUser.getIdentifier());
+                } catch (RemoteException e) {
                 }
-                if (pi != null && pi.requiredForAllUsers) {
+                if (pi != null && (pi.requiredForAllUsers || isPlatformSigned(pi))) {
                     p.setChecked(true);
                     p.setImmutable(true);
                     // If the app is required and has no restrictions, skip showing it
                     if (!hasSettings && !isSettingsApp) continue;
                     // Get and populate the defaults, since the user is not going to be
                     // able to toggle this app ON (it's ON by default and immutable).
+                    // Only do this for restricted profiles, not single-user restrictions
                     if (hasSettings) {
-                        requestRestrictionsForApp(packageName, p);
+                        requestRestrictionsForApp(packageName, p, false);
                     }
-                } else if (!mNewUser && appInfoListHasPackage(mUserApps, packageName)) {
+                } else if (!mNewUser && isAppEnabledForUser(pi)) {
                     p.setChecked(true);
                 }
-                if (pi.requiredAccountType != null && pi.restrictedAccountType == null) {
+                if (mRestrictedProfile
+                        && pi.requiredAccountType != null && pi.restrictedAccountType == null) {
                     p.setChecked(false);
                     p.setImmutable(true);
                     p.setSummary(R.string.app_not_supported_in_limited);
                 }
-                if (pi.restrictedAccountType != null) {
+                if (mRestrictedProfile && pi.restrictedAccountType != null) {
                     p.setSummary(R.string.app_sees_restricted_accounts);
                 }
                 if (app.masterEntry != null) {
@@ -644,7 +727,6 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
                 } else {
                     p.setOrder(MAX_APP_RESTRICTIONS * (i + 2));
                 }
-                p.setSelectableAppInfo(app);
                 mSelectedPackages.put(packageName, p.isChecked());
                 mAppListChanged = true;
                 i++;
@@ -654,10 +736,14 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
         // to avoid taking the hit in onPause(), which can cause race conditions on user switch.
         if (mNewUser && mFirstTime) {
             mFirstTime = false;
-            updateUserAppList();
+            applyUserAppsStates();
         }
     }
 
+    private String getKeyForPackage(String packageName) {
+        return PKG_PREFIX + packageName;
+    }
+
     private class AppLabelComparator implements Comparator<SelectableAppInfo> {
 
         @Override
@@ -677,15 +763,6 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
         return false;
     }
 
-    private boolean appInfoListHasPackage(List<ApplicationInfo> apps, String packageName) {
-        for (ApplicationInfo info : apps) {
-            if (info.packageName.equals(packageName)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     private void updateAllEntries(String prefKey, boolean checked) {
         for (int i = 0; i < mAppList.getPreferenceCount(); i++) {
             Preference pref = mAppList.getPreference(i);
@@ -699,12 +776,10 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
 
     @Override
     public void onClick(View v) {
-        if (v == mHeaderView) {
-            showDialog(DIALOG_ID_EDIT_USER_INFO);
-        } else if (v.getTag() instanceof AppRestrictionsPreference) {
+        if (v.getTag() instanceof AppRestrictionsPreference) {
             AppRestrictionsPreference pref = (AppRestrictionsPreference) v.getTag();
             if (v.getId() == R.id.app_restrictions_settings) {
-                toggleAppPanel(pref);
+                onAppSettingsIconClicked(pref);
             } else if (!pref.isImmutable()) {
                 pref.setChecked(!pref.isChecked());
                 final String packageName = pref.getKey().substring(PKG_PREFIX.length());
@@ -712,9 +787,13 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
                 if (pref.isChecked() && pref.hasSettings
                         && pref.restrictions == null) {
                     // The restrictions have not been initialized, get and save them
-                    requestRestrictionsForApp(packageName, pref);
+                    requestRestrictionsForApp(packageName, pref, false);
                 }
                 mAppListChanged = true;
+                // If it's not a restricted profile, apply the changes immediately
+                if (!mRestrictedProfile) {
+                    applyUserAppState(packageName, pref.isChecked());
+                }
                 updateAllEntries(pref.getKey(), pref.isChecked());
             }
         }
@@ -746,8 +825,6 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
                             listPref.setSummary(readable);
                             break;
                         case RestrictionEntry.TYPE_MULTI_SELECT:
-                            MultiSelectListPreference msListPref =
-                                    (MultiSelectListPreference) preference;
                             Set<String> set = (Set<String>) newValue;
                             String [] selectedValues = new String[set.size()];
                             set.toArray(selectedValues);
@@ -771,13 +848,17 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
         return true;
     }
 
-    private void toggleAppPanel(AppRestrictionsPreference preference) {
+    private void removeRestrictionsForApp(AppRestrictionsPreference preference) {
+        for (Preference p : preference.mChildren) {
+            mAppList.removePreference(p);
+        }
+        preference.mChildren.clear();
+    }
+
+    private void onAppSettingsIconClicked(AppRestrictionsPreference preference) {
         if (preference.getKey().startsWith(PKG_PREFIX)) {
-            if (preference.panelOpen) {
-                for (Preference p : preference.childPreferences) {
-                    mAppList.removePreference(p);
-                }
-                preference.childPreferences.clear();
+            if (preference.isPanelOpen()) {
+                removeRestrictionsForApp(preference);
             } else {
                 String packageName = preference.getKey().substring(PKG_PREFIX.length());
                 if (packageName.equals(getActivity().getPackageName())) {
@@ -786,15 +867,22 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
                             getActivity(), mUser);
                     onRestrictionsReceived(preference, packageName, restrictions);
                 } else {
-                    requestRestrictionsForApp(packageName, preference);
+                    requestRestrictionsForApp(packageName, preference, true /*invoke if custom*/);
                 }
             }
-            preference.panelOpen = !preference.panelOpen;
+            preference.setPanelOpen(!preference.isPanelOpen());
         }
     }
 
+    /**
+     * Send a broadcast to the app to query its restrictions
+     * @param packageName package name of the app with restrictions
+     * @param preference the preference item for the app toggle
+     * @param invokeIfCustom whether to directly launch any custom activity that is returned
+     *        for the app.
+     */
     private void requestRestrictionsForApp(String packageName,
-            AppRestrictionsPreference preference) {
+            AppRestrictionsPreference preference, boolean invokeIfCustom) {
         Bundle oldEntries =
                 mUserManager.getApplicationRestrictions(packageName, mUser);
         Intent intent = new Intent(Intent.ACTION_GET_RESTRICTION_ENTRIES);
@@ -802,7 +890,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
         intent.putExtra(Intent.EXTRA_RESTRICTIONS_BUNDLE, oldEntries);
         intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
         getActivity().sendOrderedBroadcast(intent, null,
-                new RestrictionsResultReceiver(packageName, preference),
+                new RestrictionsResultReceiver(packageName, preference, invokeIfCustom),
                 null, Activity.RESULT_OK, null, null);
     }
 
@@ -811,11 +899,14 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
         private static final String CUSTOM_RESTRICTIONS_INTENT = Intent.EXTRA_RESTRICTIONS_INTENT;
         String packageName;
         AppRestrictionsPreference preference;
+        boolean invokeIfCustom;
 
-        RestrictionsResultReceiver(String packageName, AppRestrictionsPreference preference) {
+        RestrictionsResultReceiver(String packageName, AppRestrictionsPreference preference,
+                boolean invokeIfCustom) {
             super();
             this.packageName = packageName;
             this.preference = preference;
+            this.invokeIfCustom = invokeIfCustom;
         }
 
         @Override
@@ -826,37 +917,26 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
             Intent restrictionsIntent = (Intent) results.getParcelable(CUSTOM_RESTRICTIONS_INTENT);
             if (restrictions != null && restrictionsIntent == null) {
                 onRestrictionsReceived(preference, packageName, restrictions);
-                mUserManager.setApplicationRestrictions(packageName,
-                        RestrictionUtils.restrictionsToBundle(restrictions), mUser);
-            } else if (restrictionsIntent != null) {
-                final Intent customIntent = restrictionsIntent;
-                if (restrictions != null) {
-                    customIntent.putExtra(Intent.EXTRA_RESTRICTIONS_BUNDLE,
-                            RestrictionUtils.restrictionsToBundle(restrictions));
+                if (mRestrictedProfile) {
+                    mUserManager.setApplicationRestrictions(packageName,
+                            RestrictionUtils.restrictionsToBundle(restrictions), mUser);
                 }
-                Preference p = new Preference(context);
-                p.setTitle(R.string.app_restrictions_custom_label);
-                p.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-                    @Override
-                    public boolean onPreferenceClick(Preference preference) {
-                        int requestCode = generateCustomActivityRequestCode(
-                                RestrictionsResultReceiver.this.preference);
-                        AppRestrictionsFragment.this.startActivityForResult(
-                                customIntent, requestCode);
-                        return false;
-                    }
-                });
-                p.setPersistent(false);
-                p.setOrder(preference.getOrder() + 1);
-                preference.childPreferences.add(p);
-                mAppList.addPreference(p);
+            } else if (restrictionsIntent != null) {
                 preference.setRestrictions(restrictions);
+                if (invokeIfCustom && AppRestrictionsFragment.this.isResumed()) {
+                    int requestCode = generateCustomActivityRequestCode(
+                            RestrictionsResultReceiver.this.preference);
+                    AppRestrictionsFragment.this.startActivityForResult(
+                            restrictionsIntent, requestCode);
+                }
             }
         }
     }
 
     private void onRestrictionsReceived(AppRestrictionsPreference preference, String packageName,
             ArrayList<RestrictionEntry> restrictions) {
+        // Remove any earlier restrictions
+        removeRestrictionsForApp(preference);
         // Non-custom-activity case - expand the restrictions in-place
         final Context context = preference.getContext();
         int count = 1;
@@ -907,7 +987,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
                         + entry.getKey());
                 mAppList.addPreference(p);
                 p.setOnPreferenceChangeListener(AppRestrictionsFragment.this);
-                preference.childPreferences.add(p);
+                preference.mChildren.add(p);
                 count++;
             }
         }
@@ -936,11 +1016,6 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if (mEditUserInfoDialog != null && mEditUserInfoDialog.isShowing()
-                && mEditUserPhotoController.onActivityResult(requestCode, resultCode, data)) {
-            return;
-        }
-
         AppRestrictionsPreference pref = mCustomRequestMap.get(requestCode);
         if (pref == null) {
             Log.w(TAG, "Unknown requestCode " + requestCode);
@@ -961,7 +1036,6 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
                 // If there's a valid result, persist it to the user manager.
                 mUserManager.setApplicationRestrictions(packageName, bundle, mUser);
             }
-            toggleAppPanel(pref);
         }
         // Remove request from the map
         mCustomRequestMap.remove(requestCode);
@@ -982,327 +1056,17 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
         if (preference.getKey().startsWith(PKG_PREFIX)) {
             AppRestrictionsPreference arp = (AppRestrictionsPreference) preference;
             if (!arp.isImmutable()) {
-                arp.setChecked(!arp.isChecked());
-                mSelectedPackages.put(arp.getKey().substring(PKG_PREFIX.length()), arp.isChecked());
-                updateAllEntries(arp.getKey(), arp.isChecked());
+                final String packageName = arp.getKey().substring(PKG_PREFIX.length());
+                final boolean newEnabledState = !arp.isChecked();
+                arp.setChecked(newEnabledState);
+                mSelectedPackages.put(packageName, newEnabledState);
+                updateAllEntries(arp.getKey(), newEnabledState);
                 mAppListChanged = true;
+                applyUserAppState(packageName, newEnabledState);
             }
             return true;
         }
         return false;
     }
 
-    @Override
-    public Dialog onCreateDialog(int dialogId) {
-        if (dialogId == DIALOG_ID_EDIT_USER_INFO) {
-            if (mEditUserInfoDialog != null) {
-                return mEditUserInfoDialog;
-            }
-
-            LayoutInflater inflater = getActivity().getLayoutInflater();
-            View content = inflater.inflate(R.layout.edit_user_info_dialog_content, null);
-
-            UserInfo info = mUserManager.getUserInfo(mUser.getIdentifier());
-
-            final EditText userNameView = (EditText) content.findViewById(R.id.user_name);
-            userNameView.setText(info.name);
-
-            final ImageView userPhotoView = (ImageView) content.findViewById(R.id.user_photo);
-            Drawable drawable = null;
-            if (mSavedPhoto != null) {
-                drawable = CircleFramedDrawable.getInstance(getActivity(), mSavedPhoto);
-            } else {
-                drawable = mUserIconView.getDrawable();
-                if (drawable == null) {
-                    drawable = getCircularUserIcon();
-                }
-            }
-            userPhotoView.setImageDrawable(drawable);
-
-            mEditUserPhotoController = new EditUserPhotoController(this, userPhotoView,
-                    mSavedPhoto, drawable);
-
-            mEditUserInfoDialog = new AlertDialog.Builder(getActivity())
-                .setTitle(R.string.profile_info_settings_title)
-                .setIconAttribute(R.drawable.ic_settings_multiuser)
-                .setView(content)
-                .setCancelable(true)
-                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        if (which == DialogInterface.BUTTON_POSITIVE) {
-                            // Update the name if changed.
-                            CharSequence userName = userNameView.getText();
-                            if (!TextUtils.isEmpty(userName)) {
-                                CharSequence oldUserName = mUserNameView.getText();
-                                if (oldUserName == null
-                                        || !userName.toString().equals(oldUserName.toString())) {
-                                    ((TextView) mHeaderView.findViewById(android.R.id.title))
-                                            .setText(userName.toString());
-                                    mUserManager.setUserName(mUser.getIdentifier(),
-                                            userName.toString());
-                                }
-                            }
-                            // Update the photo if changed.
-                            Drawable drawable = mEditUserPhotoController.getNewUserPhotoDrawable();
-                            Bitmap bitmap = mEditUserPhotoController.getNewUserPhotoBitmap();
-                            if (drawable != null && bitmap != null
-                                    && !drawable.equals(mUserIconView.getDrawable())) {
-                                mUserIconView.setImageDrawable(drawable);
-                                new AsyncTask<Void, Void, Void>() {
-                                    @Override
-                                    protected Void doInBackground(Void... params) {
-                                        mUserManager.setUserIcon(mUser.getIdentifier(),
-                                                mEditUserPhotoController.getNewUserPhotoBitmap());
-                                        return null;
-                                    }
-                                }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[]) null);
-                            }
-                            removeDialog(DIALOG_ID_EDIT_USER_INFO);
-                        }
-                        clearEditUserInfoDialog();
-                    }
-                })
-                .setNegativeButton(android.R.string.cancel,  new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        clearEditUserInfoDialog();
-                    }
-                 })
-                .create();
-
-            // Make sure the IME is up.
-            mEditUserInfoDialog.getWindow().setSoftInputMode(
-                    WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
-
-            return mEditUserInfoDialog;
-        }
-
-        return null;
-    }
-
-    private void clearEditUserInfoDialog() {
-        mEditUserInfoDialog = null;
-        mSavedPhoto = null;
-    }
-
-    private static class EditUserPhotoController {
-        private static final int POPUP_LIST_ITEM_ID_CHOOSE_PHOTO = 1;
-        private static final int POPUP_LIST_ITEM_ID_TAKE_PHOTO = 2;
-
-        // It seems that this class generates custom request codes and they may
-        // collide with ours, these values are very unlikely to have a conflict.
-        private static final int REQUEST_CODE_CHOOSE_PHOTO = Integer.MAX_VALUE;
-        private static final int REQUEST_CODE_TAKE_PHOTO = Integer.MAX_VALUE - 1;
-        private static final int REQUEST_CODE_CROP_PHOTO = Integer.MAX_VALUE - 2;
-
-        private static final String CROP_PICTURE_FILE_NAME = "CropEditUserPhoto.jpg";
-        private static final String TAKE_PICTURE_FILE_NAME = "TakeEditUserPhoto2.jpg";
-
-        private final int mPhotoSize;
-
-        private final Context mContext;
-        private final Fragment mFragment;
-        private final ImageView mImageView;
-
-        private final Uri mCropPictureUri;
-        private final Uri mTakePictureUri;
-
-        private Bitmap mNewUserPhotoBitmap;
-        private Drawable mNewUserPhotoDrawable;
-
-        public EditUserPhotoController(Fragment fragment, ImageView view,
-                Bitmap bitmap, Drawable drawable) {
-            mContext = view.getContext();
-            mFragment = fragment;
-            mImageView = view;
-            mCropPictureUri = createTempImageUri(mContext, CROP_PICTURE_FILE_NAME);
-            mTakePictureUri = createTempImageUri(mContext, TAKE_PICTURE_FILE_NAME);
-            mPhotoSize = getPhotoSize(mContext);
-            mImageView.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    showUpdatePhotoPopup();
-                }
-            });
-            mNewUserPhotoBitmap = bitmap;
-            mNewUserPhotoDrawable = drawable;
-        }
-
-        public boolean onActivityResult(int requestCode, int resultCode, final Intent data) {
-            if (resultCode != Activity.RESULT_OK) {
-                return false;
-            }
-            switch (requestCode) {
-                case REQUEST_CODE_CHOOSE_PHOTO:
-                case REQUEST_CODE_CROP_PHOTO: {
-                    new AsyncTask<Void, Void, Bitmap>() {
-                        @Override
-                        protected Bitmap doInBackground(Void... params) {
-                            return BitmapFactory.decodeFile(mCropPictureUri.getPath());
-                        }
-                        @Override
-                        protected void onPostExecute(Bitmap bitmap) {
-                            mNewUserPhotoBitmap = bitmap;
-                            mNewUserPhotoDrawable = CircleFramedDrawable
-                                    .getInstance(mImageView.getContext(), mNewUserPhotoBitmap);
-                            mImageView.setImageDrawable(mNewUserPhotoDrawable);
-                            // Delete the files - not needed anymore.
-                            new File(mCropPictureUri.getPath()).delete();
-                            new File(mTakePictureUri.getPath()).delete();
-                        }
-                    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[]) null);
-                } return true;
-                case REQUEST_CODE_TAKE_PHOTO: {
-                    cropPhoto();
-                } break;
-            }
-            return false;
-        }
-
-        public Bitmap getNewUserPhotoBitmap() {
-            return mNewUserPhotoBitmap;
-        }
-
-        public Drawable getNewUserPhotoDrawable() {
-            return mNewUserPhotoDrawable;
-        }
-
-        private void showUpdatePhotoPopup() {
-            final boolean canTakePhoto = canTakePhoto();
-            final boolean canChoosePhoto = canChoosePhoto();
-
-            if (!canTakePhoto && !canChoosePhoto) {
-                return;
-            }
-
-            Context context = mImageView.getContext();
-            final List<AdapterItem> items = new ArrayList<AdapterItem>();
-
-            if (canTakePhoto()) {
-                String title = mImageView.getContext().getString( R.string.user_image_take_photo);
-                AdapterItem item = new AdapterItem(title, POPUP_LIST_ITEM_ID_TAKE_PHOTO);
-                items.add(item);
-            }
-
-            if (canChoosePhoto) {
-                String title = context.getString(R.string.user_image_choose_photo);
-                AdapterItem item = new AdapterItem(title, POPUP_LIST_ITEM_ID_CHOOSE_PHOTO);
-                items.add(item);
-            }
-
-            final ListPopupWindow listPopupWindow = new ListPopupWindow(context);
-
-            listPopupWindow.setAnchorView(mImageView);
-            listPopupWindow.setModal(true);
-            listPopupWindow.setInputMethodMode(ListPopupWindow.INPUT_METHOD_NOT_NEEDED);
-
-            ListAdapter adapter = new ArrayAdapter<AdapterItem>(context,
-                    R.layout.edit_user_photo_popup_item, items);
-            listPopupWindow.setAdapter(adapter);
-
-            final int width = Math.max(mImageView.getWidth(), context.getResources()
-                    .getDimensionPixelSize(R.dimen.update_user_photo_popup_min_width));
-            listPopupWindow.setWidth(width);
-
-            listPopupWindow.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-                @Override
-                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                    AdapterItem item = items.get(position);
-                    switch (item.id) {
-                        case POPUP_LIST_ITEM_ID_CHOOSE_PHOTO: {
-                            choosePhoto();
-                            listPopupWindow.dismiss();
-                        } break;
-                        case POPUP_LIST_ITEM_ID_TAKE_PHOTO: {
-                            takePhoto();
-                            listPopupWindow.dismiss();
-                        } break;
-                    }
-                }
-            });
-
-            listPopupWindow.show();
-        }
-
-        private boolean canTakePhoto() {
-            return mImageView.getContext().getPackageManager().queryIntentActivities(
-                    new Intent(MediaStore.ACTION_IMAGE_CAPTURE),
-                    PackageManager.MATCH_DEFAULT_ONLY).size() > 0;
-        }
-
-        private boolean canChoosePhoto() {
-            Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-            intent.setType("image/*");
-            return mImageView.getContext().getPackageManager().queryIntentActivities(
-                    intent, 0).size() > 0;
-        }
-
-        private void takePhoto() {
-            Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-            intent.putExtra(MediaStore.EXTRA_OUTPUT, mTakePictureUri);
-            mFragment.startActivityForResult(intent, REQUEST_CODE_TAKE_PHOTO);
-        }
-
-        private void choosePhoto() {
-            Intent intent = new Intent(Intent.ACTION_GET_CONTENT, null);
-            intent.setType("image/*");
-            intent.putExtra(MediaStore.EXTRA_OUTPUT, mCropPictureUri);
-            appendCropExtras(intent);
-            mFragment.startActivityForResult(intent, REQUEST_CODE_CHOOSE_PHOTO);
-        }
-
-        private void cropPhoto() {
-            Intent intent = new Intent("com.android.camera.action.CROP");
-            intent.setDataAndType(mTakePictureUri, "image/*");
-            intent.putExtra(MediaStore.EXTRA_OUTPUT, mCropPictureUri);
-            appendCropExtras(intent);
-            mFragment.startActivityForResult(intent, REQUEST_CODE_CROP_PHOTO);
-        }
-
-        private void appendCropExtras(Intent intent) {
-            intent.putExtra("crop", "true");
-            intent.putExtra("scale", true);
-            intent.putExtra("scaleUpIfNeeded", true);
-            intent.putExtra("aspectX", 1);
-            intent.putExtra("aspectY", 1);
-            intent.putExtra("outputX", mPhotoSize);
-            intent.putExtra("outputY", mPhotoSize);
-        }
-
-        private static int getPhotoSize(Context context) {
-            Cursor cursor = context.getContentResolver().query(
-                    DisplayPhoto.CONTENT_MAX_DIMENSIONS_URI,
-                    new String[]{DisplayPhoto.DISPLAY_MAX_DIM}, null, null, null);
-            try {
-                cursor.moveToFirst();
-                return cursor.getInt(0);
-            } finally {
-                cursor.close();
-            }
-        }
-
-        private static Uri createTempImageUri(Context context, String fileName) {
-            File folder = context.getExternalCacheDir();
-            folder.mkdirs();
-            File fullPath = new File(folder, fileName);
-            fullPath.delete();
-            return Uri.fromFile(fullPath.getAbsoluteFile());
-        }
-
-        private static final class AdapterItem {
-            final String title;
-            final int id;
-
-            public AdapterItem(String title, int id) {
-                this.title = title;
-                this.id = id;
-            }
-
-            @Override
-            public String toString() {
-                return title;
-            }
-        }
-    }
 }
diff --git a/src/com/android/settings/users/RestrictedProfileSettings.java b/src/com/android/settings/users/RestrictedProfileSettings.java
new file mode 100644
index 00000000000..c29353616f8
--- /dev/null
+++ b/src/com/android/settings/users/RestrictedProfileSettings.java
@@ -0,0 +1,546 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.users;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.Fragment;
+import android.content.ClipData;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.provider.MediaStore;
+import android.provider.ContactsContract.DisplayPhoto;
+import android.support.v4.content.FileProvider;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+import android.widget.ListPopupWindow;
+import android.widget.TextView;
+
+import com.android.settings.R;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+public class RestrictedProfileSettings extends AppRestrictionsFragment {
+
+    private static final String KEY_SAVED_PHOTO = "pending_photo";
+    private static final String KEY_AWAITING_RESULT = "awaiting_result";
+    private static final int DIALOG_ID_EDIT_USER_INFO = 1;
+    public static final String FILE_PROVIDER_AUTHORITY = "com.android.settings.files";
+
+    private View mHeaderView;
+    private ImageView mUserIconView;
+    private TextView mUserNameView;
+
+    private Dialog mEditUserInfoDialog;
+    private EditUserPhotoController mEditUserPhotoController;
+    private Bitmap mSavedPhoto;
+    private boolean mWaitingForActivityResult;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        if (icicle != null) {
+            mSavedPhoto = (Bitmap) icicle.getParcelable(KEY_SAVED_PHOTO);
+            mWaitingForActivityResult = icicle.getBoolean(KEY_AWAITING_RESULT, false);
+        }
+
+        init(icicle);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        if (mHeaderView == null) {
+            mHeaderView = LayoutInflater.from(getActivity()).inflate(
+                    R.layout.user_info_header, null);
+            ((ViewGroup) getListView().getParent()).addView(mHeaderView, 0);
+            mHeaderView.setOnClickListener(this);
+            mUserIconView = (ImageView) mHeaderView.findViewById(android.R.id.icon);
+            mUserNameView = (TextView) mHeaderView.findViewById(android.R.id.title);
+            getListView().setFastScrollEnabled(true);
+        }
+        // This is going to bind the preferences.
+        super.onActivityCreated(savedInstanceState);
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        if (mEditUserInfoDialog != null && mEditUserInfoDialog.isShowing()
+                && mEditUserPhotoController != null) {
+            outState.putParcelable(KEY_SAVED_PHOTO,
+                    mEditUserPhotoController.getNewUserPhotoBitmap());
+        }
+        if (mWaitingForActivityResult) {
+            outState.putBoolean(KEY_AWAITING_RESULT, mWaitingForActivityResult);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // Check if user still exists
+        UserInfo info = getExistingUser(mUser);
+        if (info == null) {
+            finishFragment();
+        } else {
+            ((TextView) mHeaderView.findViewById(android.R.id.title)).setText(info.name);
+            ((ImageView) mHeaderView.findViewById(android.R.id.icon)).setImageDrawable(
+                    getCircularUserIcon());
+        }
+    }
+
+    private UserInfo getExistingUser(UserHandle thisUser) {
+        final List<UserInfo> users = mUserManager.getUsers(true); // Only get non-dying
+        for (UserInfo user : users) {
+            if (user.id == thisUser.getIdentifier()) {
+                return user;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public void startActivityForResult(Intent intent, int requestCode) {
+        mWaitingForActivityResult = true;
+        super.startActivityForResult(intent, requestCode);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        mWaitingForActivityResult = false;
+
+        if (mEditUserInfoDialog != null && mEditUserInfoDialog.isShowing()
+                && mEditUserPhotoController.onActivityResult(requestCode, resultCode, data)) {
+            return;
+        }
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view == mHeaderView) {
+            showDialog(DIALOG_ID_EDIT_USER_INFO);
+        } else {
+            super.onClick(view); // in AppRestrictionsFragment
+        }
+    }
+
+    @Override
+    public Dialog onCreateDialog(int dialogId) {
+        if (dialogId == DIALOG_ID_EDIT_USER_INFO) {
+            if (mEditUserInfoDialog != null) {
+                return mEditUserInfoDialog;
+            }
+
+            LayoutInflater inflater = getActivity().getLayoutInflater();
+            View content = inflater.inflate(R.layout.edit_user_info_dialog_content, null);
+
+            UserInfo info = mUserManager.getUserInfo(mUser.getIdentifier());
+
+            final EditText userNameView = (EditText) content.findViewById(R.id.user_name);
+            userNameView.setText(info.name);
+
+            final ImageView userPhotoView = (ImageView) content.findViewById(R.id.user_photo);
+            Drawable drawable = null;
+            if (mSavedPhoto != null) {
+                drawable = CircleFramedDrawable.getInstance(getActivity(), mSavedPhoto);
+            } else {
+                drawable = mUserIconView.getDrawable();
+                if (drawable == null) {
+                    drawable = getCircularUserIcon();
+                }
+            }
+            userPhotoView.setImageDrawable(drawable);
+            mEditUserPhotoController = new EditUserPhotoController(this, userPhotoView,
+                    mSavedPhoto, drawable, mWaitingForActivityResult);
+
+            mEditUserInfoDialog = new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.profile_info_settings_title)
+                .setIconAttribute(R.drawable.ic_settings_multiuser)
+                .setView(content)
+                .setCancelable(true)
+                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (which == DialogInterface.BUTTON_POSITIVE) {
+                            // Update the name if changed.
+                            CharSequence userName = userNameView.getText();
+                            if (!TextUtils.isEmpty(userName)) {
+                                CharSequence oldUserName = mUserNameView.getText();
+                                if (oldUserName == null
+                                        || !userName.toString().equals(oldUserName.toString())) {
+                                    ((TextView) mHeaderView.findViewById(android.R.id.title))
+                                            .setText(userName.toString());
+                                    mUserManager.setUserName(mUser.getIdentifier(),
+                                            userName.toString());
+                                }
+                            }
+                            // Update the photo if changed.
+                            Drawable drawable = mEditUserPhotoController.getNewUserPhotoDrawable();
+                            Bitmap bitmap = mEditUserPhotoController.getNewUserPhotoBitmap();
+                            if (drawable != null && bitmap != null
+                                    && !drawable.equals(mUserIconView.getDrawable())) {
+                                mUserIconView.setImageDrawable(drawable);
+                                new AsyncTask<Void, Void, Void>() {
+                                    @Override
+                                    protected Void doInBackground(Void... params) {
+                                        mUserManager.setUserIcon(mUser.getIdentifier(),
+                                                mEditUserPhotoController.getNewUserPhotoBitmap());
+                                        return null;
+                                    }
+                                }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[]) null);
+                            }
+                            removeDialog(DIALOG_ID_EDIT_USER_INFO);
+                        }
+                        clearEditUserInfoDialog();
+                    }
+                })
+                .setNegativeButton(android.R.string.cancel,  new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        clearEditUserInfoDialog();
+                    }
+                 })
+                .create();
+
+            // Make sure the IME is up.
+            mEditUserInfoDialog.getWindow().setSoftInputMode(
+                    WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+
+            return mEditUserInfoDialog;
+        }
+
+        return null;
+    }
+
+    private void clearEditUserInfoDialog() {
+        mEditUserInfoDialog = null;
+        mSavedPhoto = null;
+    }
+
+    private static class EditUserPhotoController {
+        private static final int POPUP_LIST_ITEM_ID_CHOOSE_PHOTO = 1;
+        private static final int POPUP_LIST_ITEM_ID_TAKE_PHOTO = 2;
+
+        // It seems that this class generates custom request codes and they may
+        // collide with ours, these values are very unlikely to have a conflict.
+        private static final int REQUEST_CODE_CHOOSE_PHOTO = 1;
+        private static final int REQUEST_CODE_TAKE_PHOTO   = 2;
+        private static final int REQUEST_CODE_CROP_PHOTO   = 3;
+
+        private static final String CROP_PICTURE_FILE_NAME = "CropEditUserPhoto.jpg";
+        private static final String TAKE_PICTURE_FILE_NAME = "TakeEditUserPhoto2.jpg";
+
+        private final int mPhotoSize;
+
+        private final Context mContext;
+        private final Fragment mFragment;
+        private final ImageView mImageView;
+
+        private final Uri mCropPictureUri;
+        private final Uri mTakePictureUri;
+
+        private Bitmap mNewUserPhotoBitmap;
+        private Drawable mNewUserPhotoDrawable;
+
+        public EditUserPhotoController(Fragment fragment, ImageView view,
+                Bitmap bitmap, Drawable drawable, boolean waiting) {
+            mContext = view.getContext();
+            mFragment = fragment;
+            mImageView = view;
+            mCropPictureUri = createTempImageUri(mContext, CROP_PICTURE_FILE_NAME, !waiting);
+            mTakePictureUri = createTempImageUri(mContext, TAKE_PICTURE_FILE_NAME, !waiting);
+            mPhotoSize = getPhotoSize(mContext);
+            mImageView.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    showUpdatePhotoPopup();
+                }
+            });
+            mNewUserPhotoBitmap = bitmap;
+            mNewUserPhotoDrawable = drawable;
+        }
+
+        public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
+            if (resultCode != Activity.RESULT_OK) {
+                return false;
+            }
+            final Uri pictureUri = data != null && data.getData() != null
+                    ? data.getData() : mTakePictureUri;
+            switch (requestCode) {
+                case REQUEST_CODE_CROP_PHOTO:
+                    onPhotoCropped(pictureUri, true);
+                    return true;
+                case REQUEST_CODE_TAKE_PHOTO:
+                case REQUEST_CODE_CHOOSE_PHOTO:
+                    cropPhoto(pictureUri);
+                    return true;
+            }
+            return false;
+        }
+
+        public Bitmap getNewUserPhotoBitmap() {
+            return mNewUserPhotoBitmap;
+        }
+
+        public Drawable getNewUserPhotoDrawable() {
+            return mNewUserPhotoDrawable;
+        }
+
+        private void showUpdatePhotoPopup() {
+            final boolean canTakePhoto = canTakePhoto();
+            final boolean canChoosePhoto = canChoosePhoto();
+
+            if (!canTakePhoto && !canChoosePhoto) {
+                return;
+            }
+
+            Context context = mImageView.getContext();
+            final List<AdapterItem> items = new ArrayList<AdapterItem>();
+
+            if (canTakePhoto()) {
+                String title = mImageView.getContext().getString( R.string.user_image_take_photo);
+                AdapterItem item = new AdapterItem(title, POPUP_LIST_ITEM_ID_TAKE_PHOTO);
+                items.add(item);
+            }
+
+            if (canChoosePhoto) {
+                String title = context.getString(R.string.user_image_choose_photo);
+                AdapterItem item = new AdapterItem(title, POPUP_LIST_ITEM_ID_CHOOSE_PHOTO);
+                items.add(item);
+            }
+
+            final ListPopupWindow listPopupWindow = new ListPopupWindow(context);
+
+            listPopupWindow.setAnchorView(mImageView);
+            listPopupWindow.setModal(true);
+            listPopupWindow.setInputMethodMode(ListPopupWindow.INPUT_METHOD_NOT_NEEDED);
+
+            ListAdapter adapter = new ArrayAdapter<AdapterItem>(context,
+                    R.layout.edit_user_photo_popup_item, items);
+            listPopupWindow.setAdapter(adapter);
+
+            final int width = Math.max(mImageView.getWidth(), context.getResources()
+                    .getDimensionPixelSize(R.dimen.update_user_photo_popup_min_width));
+            listPopupWindow.setWidth(width);
+
+            listPopupWindow.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                @Override
+                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                    AdapterItem item = items.get(position);
+                    switch (item.id) {
+                        case POPUP_LIST_ITEM_ID_CHOOSE_PHOTO: {
+                            choosePhoto();
+                            listPopupWindow.dismiss();
+                        } break;
+                        case POPUP_LIST_ITEM_ID_TAKE_PHOTO: {
+                            takePhoto();
+                            listPopupWindow.dismiss();
+                        } break;
+                    }
+                }
+            });
+
+            listPopupWindow.show();
+        }
+
+        private boolean canTakePhoto() {
+            return mImageView.getContext().getPackageManager().queryIntentActivities(
+                    new Intent(MediaStore.ACTION_IMAGE_CAPTURE),
+                    PackageManager.MATCH_DEFAULT_ONLY).size() > 0;
+        }
+
+        private boolean canChoosePhoto() {
+            Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+            intent.setType("image/*");
+            return mImageView.getContext().getPackageManager().queryIntentActivities(
+                    intent, 0).size() > 0;
+        }
+
+        private void takePhoto() {
+            Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+            appendOutputExtra(intent, mTakePictureUri);
+            mFragment.startActivityForResult(intent, REQUEST_CODE_TAKE_PHOTO);
+        }
+
+        private void choosePhoto() {
+            Intent intent = new Intent(Intent.ACTION_GET_CONTENT, null);
+            intent.setType("image/*");
+            appendOutputExtra(intent, mTakePictureUri);
+            mFragment.startActivityForResult(intent, REQUEST_CODE_CHOOSE_PHOTO);
+        }
+
+        private void cropPhoto(Uri pictureUri) {
+            // TODO: Use a public intent, when there is one.
+            Intent intent = new Intent("com.android.camera.action.CROP");
+            intent.setDataAndType(pictureUri, "image/*");
+            appendOutputExtra(intent, mCropPictureUri);
+            appendCropExtras(intent);
+            if (intent.resolveActivity(mContext.getPackageManager()) != null) {
+                mFragment.startActivityForResult(intent, REQUEST_CODE_CROP_PHOTO);
+            } else {
+                onPhotoCropped(pictureUri, false);
+            }
+        }
+
+        private void appendOutputExtra(Intent intent, Uri pictureUri) {
+            intent.putExtra(MediaStore.EXTRA_OUTPUT, pictureUri);
+            intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                    | Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            intent.setClipData(ClipData.newRawUri(MediaStore.EXTRA_OUTPUT, pictureUri));
+        }
+
+        private void appendCropExtras(Intent intent) {
+            intent.putExtra("crop", "true");
+            intent.putExtra("scale", true);
+            intent.putExtra("scaleUpIfNeeded", true);
+            intent.putExtra("aspectX", 1);
+            intent.putExtra("aspectY", 1);
+            intent.putExtra("outputX", mPhotoSize);
+            intent.putExtra("outputY", mPhotoSize);
+        }
+
+        private void onPhotoCropped(final Uri data, final boolean cropped) {
+            new AsyncTask<Void, Void, Bitmap>() {
+                @Override
+                protected Bitmap doInBackground(Void... params) {
+                    if (cropped) {
+                        try {
+                            InputStream imageStream = mContext.getContentResolver()
+                                    .openInputStream(data);
+                            return BitmapFactory.decodeStream(imageStream);
+                        } catch (FileNotFoundException fe) {
+                            return null;
+                        }
+                    } else {
+                        // Scale and crop to a square aspect ratio
+                        Bitmap croppedImage = Bitmap.createBitmap(mPhotoSize, mPhotoSize,
+                                Config.ARGB_8888);
+                        Canvas canvas = new Canvas(croppedImage);
+                        Bitmap fullImage = null;
+                        try {
+                            InputStream imageStream = mContext.getContentResolver()
+                                    .openInputStream(data);
+                            fullImage = BitmapFactory.decodeStream(imageStream);
+                        } catch (FileNotFoundException fe) {
+                            return null;
+                        }
+                        if (fullImage != null) {
+                            final int squareSize = Math.min(fullImage.getWidth(),
+                                    fullImage.getHeight());
+                            final int left = (fullImage.getWidth() - squareSize) / 2;
+                            final int top = (fullImage.getHeight() - squareSize) / 2;
+                            Rect rectSource = new Rect(left, top,
+                                    left + squareSize, top + squareSize);
+                            Rect rectDest = new Rect(0, 0, mPhotoSize, mPhotoSize);
+                            Paint paint = new Paint();
+                            canvas.drawBitmap(fullImage, rectSource, rectDest, paint);
+                            return croppedImage;
+                        } else {
+                            // Bah! Got nothin.
+                            return null;
+                        }
+                    }
+                }
+
+                @Override
+                protected void onPostExecute(Bitmap bitmap) {
+                    if (bitmap != null) {
+                        mNewUserPhotoBitmap = bitmap;
+                        mNewUserPhotoDrawable = CircleFramedDrawable
+                                .getInstance(mImageView.getContext(), mNewUserPhotoBitmap);
+                        mImageView.setImageDrawable(mNewUserPhotoDrawable);
+                    }
+                    new File(mContext.getCacheDir(), TAKE_PICTURE_FILE_NAME).delete();
+                    new File(mContext.getCacheDir(), CROP_PICTURE_FILE_NAME).delete();
+                }
+            }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[]) null);
+        }
+
+        private static int getPhotoSize(Context context) {
+            Cursor cursor = context.getContentResolver().query(
+                    DisplayPhoto.CONTENT_MAX_DIMENSIONS_URI,
+                    new String[]{DisplayPhoto.DISPLAY_MAX_DIM}, null, null, null);
+            try {
+                cursor.moveToFirst();
+                return cursor.getInt(0);
+            } finally {
+                cursor.close();
+            }
+        }
+
+        private Uri createTempImageUri(Context context, String fileName, boolean purge) {
+            final File folder = context.getCacheDir();
+            folder.mkdirs();
+            final File fullPath = new File(folder, fileName);
+            if (purge) {
+                fullPath.delete();
+            }
+            final Uri fileUri =
+                    FileProvider.getUriForFile(context, FILE_PROVIDER_AUTHORITY, fullPath);
+            return fileUri;
+        }
+
+        private static final class AdapterItem {
+            final String title;
+            final int id;
+
+            public AdapterItem(String title, int id) {
+                this.title = title;
+                this.id = id;
+            }
+
+            @Override
+            public String toString() {
+                return title;
+            }
+        }
+    }
+
+}
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index a19158f047b..bbae37d035c 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -16,6 +16,10 @@
 
 package com.android.settings.users;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.Activity;
@@ -42,8 +46,8 @@ import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
-import android.preference.PreferenceActivity;
 import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceActivity;
 import android.preference.PreferenceGroup;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.Contacts;
@@ -59,19 +63,13 @@ import android.widget.SimpleAdapter;
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.ChooseLockGeneric;
-import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;
 import com.android.settings.OwnerInfoSettings;
 import com.android.settings.R;
+import com.android.settings.RestrictedSettingsFragment;
 import com.android.settings.SelectableEditTextPreference;
-import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class UserSettings extends SettingsPreferenceFragment
+public class UserSettings extends RestrictedSettingsFragment
         implements OnPreferenceClickListener, OnClickListener, DialogInterface.OnDismissListener,
         Preference.OnPreferenceChangeListener {
 
@@ -136,6 +134,9 @@ public class UserSettings extends SettingsPreferenceFragment
     private SparseArray<Bitmap> mUserIcons = new SparseArray<Bitmap>();
     private boolean mIsOwner = UserHandle.myUserId() == UserHandle.USER_OWNER;
 
+    public UserSettings() {
+        super(RestrictedSettingsFragment.RESTRICTIONS_PIN_SET);
+    }
 
     private Handler mHandler = new Handler() {
         @Override
@@ -374,10 +375,10 @@ public class UserSettings extends SettingsPreferenceFragment
         UserInfo info = mUserManager.getUserInfo(userId);
         if (info.isRestricted() && mIsOwner) {
             Bundle extras = new Bundle();
-            extras.putInt(AppRestrictionsFragment.EXTRA_USER_ID, userId);
-            extras.putBoolean(AppRestrictionsFragment.EXTRA_NEW_USER, newUser);
+            extras.putInt(RestrictedProfileSettings.EXTRA_USER_ID, userId);
+            extras.putBoolean(RestrictedProfileSettings.EXTRA_NEW_USER, newUser);
             ((PreferenceActivity) getActivity()).startPreferencePanel(
-                    AppRestrictionsFragment.class.getName(),
+                    RestrictedProfileSettings.class.getName(),
                     extras, R.string.user_restrictions_title, null,
                     null, 0);
         } else if (info.id == UserHandle.myUserId()) {
diff --git a/src/com/android/settings/users/UserUtils.java b/src/com/android/settings/users/UserUtils.java
index 1d16bcf6c9a..946d871eabf 100644
--- a/src/com/android/settings/users/UserUtils.java
+++ b/src/com/android/settings/users/UserUtils.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.users;
 
+import android.content.Context;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -24,10 +25,10 @@ import android.graphics.drawable.Drawable;
 import android.os.UserManager;
 
 public class UserUtils {
-    public static Drawable getUserIcon(UserManager um, UserInfo user, Resources res) {
+    public static Drawable getUserIcon(Context context, UserManager um, UserInfo user, Resources res) {
         if (user.iconPath == null) return null;
         Bitmap icon = um.getUserIcon(user.id);
         if (icon == null) return null;
-        return new BitmapDrawable(res, icon);
+        return CircleFramedDrawable.getInstance(context, icon);
     }
 }
diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
index 5b732d66506..6ec79f387e9 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -19,6 +19,7 @@ package com.android.settings.wfd;
 import android.app.ActionBar;
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.Service;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -29,8 +30,15 @@ import android.hardware.display.DisplayManager;
 import android.hardware.display.WifiDisplay;
 import android.hardware.display.WifiDisplayStatus;
 import android.net.Uri;
+import android.net.wifi.p2p.WifiP2pManager;
+import android.net.wifi.p2p.WifiP2pManager.ActionListener;
+import android.net.wifi.p2p.WifiP2pManager.Channel;
+import android.net.wifi.WpsInfo;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
+import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
@@ -38,12 +46,17 @@ import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 import android.text.Html;
+import android.util.Slog;
 import android.util.TypedValue;
 import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -59,6 +72,7 @@ import com.android.settings.SettingsPreferenceFragment;
  */
 public final class WifiDisplaySettings extends SettingsPreferenceFragment {
     private static final String TAG = "WifiDisplaySettings";
+    private static final boolean DEBUG = false;
 
     private static final int MENU_ID_SCAN = Menu.FIRST;
 
@@ -74,6 +88,17 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
 
     private Switch mActionBarSwitch;
 
+    /* certification */
+    private boolean mWifiDisplayCertificationOn;
+    private WifiP2pManager mWifiP2pManager;
+    private Channel mWifiP2pChannel;
+    private PreferenceGroup mCertCategory;
+    private boolean mListen;
+    private boolean mAutoGO;
+    private int mWpsConfig = WpsInfo.INVALID;
+    private int mListenChannel;
+    private int mOperatingChannel;
+
     public WifiDisplaySettings() {
     }
 
@@ -82,6 +107,8 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
         super.onCreate(icicle);
 
         mDisplayManager = (DisplayManager)getActivity().getSystemService(Context.DISPLAY_SERVICE);
+        mWifiP2pManager = (WifiP2pManager)getActivity().getSystemService(Context.WIFI_P2P_SERVICE);
+        mWifiP2pChannel = mWifiP2pManager.initialize(getActivity(), Looper.getMainLooper(), null);
 
         addPreferencesFromResource(R.xml.wifi_display_settings);
         setHasOptionsMenu(true);
@@ -131,8 +158,12 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
         filter.addAction(DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED);
         context.registerReceiver(mReceiver, filter);
 
-        getContentResolver().registerContentObserver(Settings.Secure.getUriFor(
+        getContentResolver().registerContentObserver(Settings.Global.getUriFor(
                 Settings.Global.WIFI_DISPLAY_ON), false, mSettingsObserver);
+        getContentResolver().registerContentObserver(Settings.Global.getUriFor(
+                Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON), false, mSettingsObserver);
+        getContentResolver().registerContentObserver(Settings.Global.getUriFor(
+            Settings.Global.WIFI_DISPLAY_WPS_CONFIG), false, mSettingsObserver);
 
         mDisplayManager.scanWifiDisplays();
 
@@ -182,7 +213,7 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
 
             if (display.equals(mWifiDisplayStatus.getActiveDisplay())) {
                 showDisconnectDialog(display);
-            } else {
+            } else if (display.canConnect()){
                 mDisplayManager.connectWifiDisplay(display.getDeviceAddress());
             }
         }
@@ -193,6 +224,10 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
     private void update() {
         mWifiDisplayOnSetting = Settings.Global.getInt(getContentResolver(),
                 Settings.Global.WIFI_DISPLAY_ON, 0) != 0;
+        mWifiDisplayCertificationOn = Settings.Global.getInt(getContentResolver(),
+                Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, 0) != 0;
+        mWpsConfig = Settings.Global.getInt(getContentResolver(),
+            Settings.Global.WIFI_DISPLAY_WPS_CONFIG, WpsInfo.INVALID);
         mWifiDisplayStatus = mDisplayManager.getWifiDisplayStatus();
 
         applyState();
@@ -207,8 +242,11 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
         preferenceScreen.removeAll();
 
         if (featureState == WifiDisplayStatus.FEATURE_STATE_ON) {
-            final WifiDisplay[] pairedDisplays = mWifiDisplayStatus.getRememberedDisplays();
-            final WifiDisplay[] availableDisplays = mWifiDisplayStatus.getAvailableDisplays();
+            final WifiDisplay[] displays = mWifiDisplayStatus.getDisplays();
+
+            if (mWifiDisplayCertificationOn) {
+                buildCertificationMenu(preferenceScreen);
+            }
 
             if (mPairedDevicesCategory == null) {
                 mPairedDevicesCategory = new PreferenceCategory(getActivity());
@@ -218,13 +256,6 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
             }
             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);
@@ -234,11 +265,16 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
             }
             preferenceScreen.addPreference(mAvailableDevicesCategory);
 
-            for (WifiDisplay d : availableDisplays) {
-                if (!contains(pairedDisplays, d.getDeviceAddress())) {
-                    mAvailableDevicesCategory.addPreference(createWifiDisplayPreference(d, false));
+            for (WifiDisplay d : displays) {
+                if (d.isRemembered()) {
+                    mPairedDevicesCategory.addPreference(createWifiDisplayPreference(d));
+                } else if (d.isAvailable()){
+                    mAvailableDevicesCategory.addPreference(createWifiDisplayPreference(d));
                 }
             }
+            if (mPairedDevicesCategory.getPreferenceCount() == 0) {
+                preferenceScreen.removePreference(mPairedDevicesCategory);
+            }
             if (mWifiDisplayStatus.getScanState() == WifiDisplayStatus.SCAN_STATE_SCANNING) {
                 mAvailableDevicesCategory.setProgress(true);
             } else {
@@ -253,7 +289,244 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
         getActivity().invalidateOptionsMenu();
     }
 
-    private Preference createWifiDisplayPreference(final WifiDisplay d, boolean paired) {
+    private void buildCertificationMenu(final PreferenceScreen preferenceScreen) {
+        if (mCertCategory == null) {
+            mCertCategory = new PreferenceCategory(getActivity());
+            mCertCategory.setTitle(R.string.wifi_display_certification_heading);
+        } else {
+            mCertCategory.removeAll();
+        }
+        preferenceScreen.addPreference(mCertCategory);
+
+        // display session info if there is an active p2p session
+        if (!mWifiDisplayStatus.getSessionInfo().getGroupId().isEmpty()) {
+            Preference p = new Preference(getActivity());
+            p.setTitle(R.string.wifi_display_session_info);
+            p.setSummary(mWifiDisplayStatus.getSessionInfo().toString());
+            mCertCategory.addPreference(p);
+
+            // show buttons for Pause/Resume when a WFD session is established
+            if (mWifiDisplayStatus.getSessionInfo().getSessionId() != 0) {
+                mCertCategory.addPreference(new Preference(getActivity()) {
+                    @Override
+                    public View getView(View convertView, ViewGroup parent) {
+                        final View v;
+                        if (convertView == null) {
+                            LayoutInflater li = (LayoutInflater) getActivity().
+                                    getSystemService(Service.LAYOUT_INFLATER_SERVICE);
+                            v = li.inflate(R.layout.two_buttons_panel, null);
+                        } else {
+                            v = convertView;
+                        }
+
+                        Button b = (Button)v.findViewById(R.id.left_button);
+                        b.setText(R.string.wifi_display_pause);
+                        b.setOnClickListener(new OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                mDisplayManager.pauseWifiDisplay();
+                            }
+                        });
+
+                        b = (Button)v.findViewById(R.id.right_button);
+                        b.setText(R.string.wifi_display_resume);
+                        b.setOnClickListener(new OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                mDisplayManager.resumeWifiDisplay();
+                            }
+                        });
+
+                        return v;
+                    }
+                });
+            }
+        }
+
+        // switch for Listen Mode
+        CheckBoxPreference cbp = new CheckBoxPreference(getActivity()) {
+            @Override
+            protected void onClick() {
+                mListen = !mListen;
+                setListenMode(mListen);
+                setChecked(mListen);
+            }
+        };
+        cbp.setTitle(R.string.wifi_display_listen_mode);
+        cbp.setChecked(mListen);
+        mCertCategory.addPreference(cbp);
+
+        // switch for Autonomous GO
+        cbp = new CheckBoxPreference(getActivity()) {
+            @Override
+            protected void onClick() {
+                mAutoGO = !mAutoGO;
+                if (mAutoGO) {
+                    startAutoGO();
+                } else {
+                    stopAutoGO();
+                }
+                setChecked(mAutoGO);
+            }
+        };
+        cbp.setTitle(R.string.wifi_display_autonomous_go);
+        cbp.setChecked(mAutoGO);
+        mCertCategory.addPreference(cbp);
+
+        // Drop down list for choosing WPS method (PBC/KEYPAD/DISPLAY)
+        ListPreference lp = new ListPreference(getActivity()) {
+            @Override
+            protected void onDialogClosed(boolean positiveResult) {
+                super.onDialogClosed(positiveResult);
+                if (positiveResult) {
+                    mWpsConfig = Integer.parseInt(getValue());
+                    setSummary("%1$s");
+                    getActivity().invalidateOptionsMenu();
+                    Settings.Global.putInt(getActivity().getContentResolver(),
+                            Settings.Global.WIFI_DISPLAY_WPS_CONFIG, mWpsConfig);
+                }
+            }
+        };
+        mWpsConfig = Settings.Global.getInt(getActivity().getContentResolver(),
+                Settings.Global.WIFI_DISPLAY_WPS_CONFIG, WpsInfo.INVALID);
+        String[] wpsEntries = { "Default", "PBC", "KEYPAD", "DISPLAY" };
+        String[] wpsValues = {
+            "" + WpsInfo.INVALID,
+            "" + WpsInfo.PBC,
+            "" + WpsInfo.KEYPAD,
+            "" + WpsInfo.DISPLAY };
+        lp.setTitle(R.string.wifi_display_wps_config);
+        lp.setEntries(wpsEntries);
+        lp.setEntryValues(wpsValues);
+        lp.setValue("" + mWpsConfig);
+        lp.setSummary("%1$s");
+        mCertCategory.addPreference(lp);
+
+        // Drop down list for choosing listen channel
+        lp = new ListPreference(getActivity()) {
+            @Override
+            protected void onDialogClosed(boolean positiveResult) {
+                super.onDialogClosed(positiveResult);
+                if (positiveResult) {
+                    mListenChannel = Integer.parseInt(getValue());
+                    setSummary("%1$s");
+                    getActivity().invalidateOptionsMenu();
+                    setWifiP2pChannels(mListenChannel, mOperatingChannel);
+                }
+            }
+        };
+        String[] lcEntries = { "Auto", "1", "6", "11" };
+        String[] lcValues = { "0", "1", "6", "11" };
+        lp.setTitle(R.string.wifi_display_listen_channel);
+        lp.setEntries(lcEntries);
+        lp.setEntryValues(lcValues);
+        lp.setValue("" + mListenChannel);
+        lp.setSummary("%1$s");
+        mCertCategory.addPreference(lp);
+
+        // Drop down list for choosing operating channel
+        lp = new ListPreference(getActivity()) {
+            @Override
+            protected void onDialogClosed(boolean positiveResult) {
+                super.onDialogClosed(positiveResult);
+                if (positiveResult) {
+                    mOperatingChannel = Integer.parseInt(getValue());
+                    setSummary("%1$s");
+                    getActivity().invalidateOptionsMenu();
+                    setWifiP2pChannels(mListenChannel, mOperatingChannel);
+                }
+            }
+        };
+        String[] ocEntries = { "Auto", "1", "6", "11", "36" };
+        String[] ocValues = { "0", "1", "6", "11", "36" };
+        lp.setTitle(R.string.wifi_display_operating_channel);
+        lp.setEntries(ocEntries);
+        lp.setEntryValues(ocValues);
+        lp.setValue("" + mOperatingChannel);
+        lp.setSummary("%1$s");
+        mCertCategory.addPreference(lp);
+    }
+
+    private void startAutoGO() {
+        if (DEBUG) {
+            Slog.d(TAG, "Starting Autonomous GO...");
+        }
+        mWifiP2pManager.createGroup(mWifiP2pChannel, new ActionListener() {
+            @Override
+            public void onSuccess() {
+                if (DEBUG) {
+                    Slog.d(TAG, "Successfully started AutoGO.");
+                }
+            }
+
+            @Override
+            public void onFailure(int reason) {
+                Slog.e(TAG, "Failed to start AutoGO with reason " + reason + ".");
+            }
+        });
+    }
+
+    private void stopAutoGO() {
+        if (DEBUG) {
+            Slog.d(TAG, "Stopping Autonomous GO...");
+        }
+        mWifiP2pManager.removeGroup(mWifiP2pChannel, new ActionListener() {
+            @Override
+            public void onSuccess() {
+                if (DEBUG) {
+                    Slog.d(TAG, "Successfully stopped AutoGO.");
+                }
+            }
+
+            @Override
+            public void onFailure(int reason) {
+                Slog.e(TAG, "Failed to stop AutoGO with reason " + reason + ".");
+            }
+        });
+    }
+
+    private void setListenMode(final boolean enable) {
+        if (DEBUG) {
+            Slog.d(TAG, "Setting listen mode to: " + enable);
+        }
+        mWifiP2pManager.listen(mWifiP2pChannel, enable, new ActionListener() {
+            @Override
+            public void onSuccess() {
+                if (DEBUG) {
+                    Slog.d(TAG, "Successfully " + (enable ? "entered" : "exited")
+                            +" listen mode.");
+                }
+            }
+
+            @Override
+            public void onFailure(int reason) {
+                Slog.e(TAG, "Failed to " + (enable ? "entered" : "exited")
+                        +" listen mode with reason " + reason + ".");
+            }
+        });
+    }
+
+    private void setWifiP2pChannels(final int lc, final int oc) {
+        if (DEBUG) {
+            Slog.d(TAG, "Setting wifi p2p channel: lc=" + lc + ", oc=" + oc);
+        }
+        mWifiP2pManager.setWifiP2pChannels(mWifiP2pChannel,
+                lc, oc, new ActionListener() {
+            @Override
+            public void onSuccess() {
+                if (DEBUG) {
+                    Slog.d(TAG, "Successfully set wifi p2p channels.");
+                }
+            }
+
+            @Override
+            public void onFailure(int reason) {
+                Slog.e(TAG, "Failed to set wifi p2p channels with reason " + reason + ".");
+            }
+        });
+    }
+
+    private Preference createWifiDisplayPreference(final WifiDisplay d) {
         WifiDisplayPreference p = new WifiDisplayPreference(getActivity(), d);
         if (d.equals(mWifiDisplayStatus.getActiveDisplay())) {
             switch (mWifiDisplayStatus.getActiveDisplayState()) {
@@ -264,11 +537,15 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
                     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);
+        } else if (d.isAvailable()) {
+            if (!d.canConnect()) {
+                p.setSummary(R.string.wifi_display_status_in_use);
+                p.setEnabled(false);
+            } else if (d.isRemembered()) {
+                p.setSummary(R.string.wifi_display_status_available);
+            }
         }
-        if (paired) {
+        if (d.isRemembered()) {
             p.setWidgetLayoutResource(R.layout.wifi_display_preference);
         }
         return p;
diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index 5d581d85af8..85a0494c58a 100644
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
@@ -59,7 +59,7 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
     private static final int BUTTON_WIFI = 0;
     private static final int BUTTON_BRIGHTNESS = 1;
     private static final int BUTTON_SYNC = 2;
-    private static final int BUTTON_GPS = 3;
+    private static final int BUTTON_LOCATION = 3;
     private static final int BUTTON_BLUETOOTH = 4;
 
     // This widget keeps track of two sets of states:
@@ -102,7 +102,7 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
 
     private static final StateTracker sWifiState = new WifiStateTracker();
     private static final StateTracker sBluetoothState = new BluetoothStateTracker();
-    private static final StateTracker sGpsState = new GpsStateTracker();
+    private static final StateTracker sLocationState = new LocationStateTracker();
     private static final StateTracker sSyncState = new SyncStateTracker();
     private static SettingsObserver sSettingsObserver;
 
@@ -506,24 +506,30 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
     }
 
     /**
-     * Subclass of StateTracker for GPS state.
+     * Subclass of StateTracker for location 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; }
+    private static final class LocationStateTracker extends StateTracker {
+        public int getContainerId() { return R.id.btn_location; }
+        public int getButtonId() { return R.id.img_location; }
+        public int getIndicatorId() { return R.id.ind_location; }
+        public int getButtonDescription() { return R.string.gadget_location; }
         public int getButtonImageId(boolean on) {
-            return on ? R.drawable.ic_appwidget_settings_gps_on_holo
-                    : R.drawable.ic_appwidget_settings_gps_off_holo;
+            return on ? R.drawable.ic_appwidget_settings_location_on_holo
+                    : R.drawable.ic_appwidget_settings_location_off_holo;
         }
 
         @Override
         public int getActualState(Context context) {
             ContentResolver resolver = context.getContentResolver();
-            boolean on = Settings.Secure.isLocationProviderEnabled(
-                resolver, LocationManager.GPS_PROVIDER);
-            return on ? STATE_ENABLED : STATE_DISABLED;
+            int currentLocationMode = Settings.Secure.getInt(resolver,
+                    Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
+            switch (currentLocationMode) {
+                case Settings.Secure.LOCATION_MODE_BATTERY_SAVING:
+                case Settings.Secure.LOCATION_MODE_OFF:
+                    return STATE_DISABLED;
+            }
+
+            return STATE_ENABLED;
         }
 
         @Override
@@ -542,15 +548,28 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
                     final UserManager um =
                             (UserManager) context.getSystemService(Context.USER_SERVICE);
                     if (!um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {
-                        Settings.Secure.setLocationProviderEnabled(
-                            resolver,
-                            LocationManager.GPS_PROVIDER,
-                            desiredState);
+                        int currentMode = Settings.Secure.getInt(resolver,
+                                Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
+                        int mode = Settings.Secure.LOCATION_MODE_HIGH_ACCURACY;
+                        switch (currentMode) {
+                            case Settings.Secure.LOCATION_MODE_HIGH_ACCURACY:
+                                mode = Settings.Secure.LOCATION_MODE_BATTERY_SAVING;
+                                break;
+                            case Settings.Secure.LOCATION_MODE_BATTERY_SAVING:
+                                mode = Settings.Secure.LOCATION_MODE_HIGH_ACCURACY;
+                                break;
+                            case Settings.Secure.LOCATION_MODE_SENSORS_ONLY:
+                                mode = Settings.Secure.LOCATION_MODE_OFF;
+                                break;
+                            case Settings.Secure.LOCATION_MODE_OFF:
+                                mode = Settings.Secure.LOCATION_MODE_HIGH_ACCURACY;
+                                break;
+                        }
+                        Settings.Secure.putInt(resolver, Settings.Secure.LOCATION_MODE, mode);
                         return desiredState;
                     }
-                    return Settings.Secure.isLocationProviderEnabled(
-                            resolver,
-                            LocationManager.GPS_PROVIDER);
+
+                    return getActualState(context) == STATE_ENABLED;
                 }
 
                 @Override
@@ -669,8 +688,8 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
         views.setOnClickPendingIntent(R.id.btn_sync,
                 getLaunchPendingIntent(context,
                         BUTTON_SYNC));
-        views.setOnClickPendingIntent(R.id.btn_gps,
-                getLaunchPendingIntent(context, BUTTON_GPS));
+        views.setOnClickPendingIntent(R.id.btn_location,
+                getLaunchPendingIntent(context, BUTTON_LOCATION));
         views.setOnClickPendingIntent(R.id.btn_bluetooth,
                 getLaunchPendingIntent(context,
                         BUTTON_BLUETOOTH));
@@ -701,7 +720,7 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
     private static void updateButtons(RemoteViews views, Context context) {
         sWifiState.setImageViewResources(context, views);
         sBluetoothState.setImageViewResources(context, views);
-        sGpsState.setImageViewResources(context, views);
+        sLocationState.setImageViewResources(context, views);
         sSyncState.setImageViewResources(context, views);
 
         if (getBrightnessMode(context)) {
@@ -781,8 +800,8 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
             sWifiState.onActualStateChange(context, intent);
         } else if (BluetoothAdapter.ACTION_STATE_CHANGED.equals(action)) {
             sBluetoothState.onActualStateChange(context, intent);
-        } else if (LocationManager.PROVIDERS_CHANGED_ACTION.equals(action)) {
-            sGpsState.onActualStateChange(context, intent);
+        } else if (LocationManager.MODE_CHANGED_ACTION.equals(action)) {
+            sLocationState.onActualStateChange(context, intent);
         } else if (ContentResolver.ACTION_SYNC_CONN_STATUS_CHANGED.equals(action)) {
             sSyncState.onActualStateChange(context, intent);
         } else if (intent.hasCategory(Intent.CATEGORY_ALTERNATIVE)) {
@@ -794,8 +813,8 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider {
                 toggleBrightness(context);
             } else if (buttonId == BUTTON_SYNC) {
                 sSyncState.toggleState(context);
-            } else if (buttonId == BUTTON_GPS) {
-                sGpsState.toggleState(context);
+            } else if (buttonId == BUTTON_LOCATION) {
+                sLocationState.toggleState(context);
             } else if (buttonId == BUTTON_BLUETOOTH) {
                 sBluetoothState.toggleState(context);
             }
diff --git a/src/com/android/settings/wifi/AccessPoint.java b/src/com/android/settings/wifi/AccessPoint.java
index 20146eb27ae..c4d1f7c65fd 100644
--- a/src/com/android/settings/wifi/AccessPoint.java
+++ b/src/com/android/settings/wifi/AccessPoint.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.wifi;
 
+import com.android.settings.R;
+
 import android.content.Context;
 import android.net.NetworkInfo.DetailedState;
 import android.net.wifi.ScanResult;
@@ -29,8 +31,6 @@ import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 
-import com.android.settings.R;
-
 class AccessPoint extends Preference {
     static final String TAG = "Settings.AccessPoint";
 
@@ -211,7 +211,8 @@ class AccessPoint extends Preference {
             signal.setImageDrawable(null);
         } else {
             signal.setImageLevel(getLevel());
-            signal.setImageResource(R.drawable.wifi_signal);
+            signal.setImageDrawable(getContext().getTheme().obtainStyledAttributes(
+                    new int[] {R.attr.wifi_signal}).getDrawable(0));
             signal.setImageState((security != SECURITY_NONE) ?
                     STATE_SECURED : STATE_NONE, true);
         }
diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java
index 82b0cc6180e..f1720c1c7df 100644
--- a/src/com/android/settings/wifi/WifiDialog.java
+++ b/src/com/android/settings/wifi/WifiDialog.java
@@ -38,7 +38,7 @@ class WifiDialog extends AlertDialog implements WifiConfigUiBase {
 
     public WifiDialog(Context context, DialogInterface.OnClickListener listener,
             AccessPoint accessPoint, boolean edit) {
-        super(context, R.style.Theme_WifiDialog);
+        super(context);
         mEdit = edit;
         mListener = listener;
         mAccessPoint = accessPoint;
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index 7ce3b8d9cca..a6989f0c23c 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -120,11 +120,10 @@ public class WifiEnabler implements CompoundButton.OnCheckedChangeListener  {
             mWifiManager.setWifiApEnabled(null, false);
         }
 
-        if (mWifiManager.setWifiEnabled(isChecked)) {
-            // Intent has been taken into account, disable until new state is active
-            mSwitch.setEnabled(false);
-        } else {
+        mSwitch.setEnabled(false);
+        if (!mWifiManager.setWifiEnabled(isChecked)) {
             // Error
+            mSwitch.setEnabled(true);
             Toast.makeText(mContext, R.string.wifi_error, Toast.LENGTH_SHORT).show();
         }
     }
diff --git a/src/com/android/settings/wifi/WifiPickerActivity.java b/src/com/android/settings/wifi/WifiPickerActivity.java
index 12612b5a720..e1e7c51c1f1 100644
--- a/src/com/android/settings/wifi/WifiPickerActivity.java
+++ b/src/com/android/settings/wifi/WifiPickerActivity.java
@@ -16,6 +16,8 @@
 package com.android.settings.wifi;
 
 import com.android.settings.ButtonBarHandler;
+import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;
+import com.android.settings.wifi.p2p.WifiP2pSettings;
 
 import android.app.Fragment;
 import android.content.Intent;
@@ -42,6 +44,14 @@ public class WifiPickerActivity extends PreferenceActivity implements ButtonBarH
         return modIntent;
     }
 
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (WifiSettings.class.getName().equals(fragmentName)
+                || WifiP2pSettings.class.getName().equals(fragmentName)
+                || AdvancedWifiSettings.class.getName().equals(fragmentName)) return true;
+        return false;
+    }
+
     /**
      * Almost dead copy of
      * {@link PreferenceActivity#startWithFragment(String, Bundle, Fragment, int)}, except
diff --git a/src/com/android/settings/wifi/WifiScanModeActivity.java b/src/com/android/settings/wifi/WifiScanModeActivity.java
index b83b22f0b0c..4133eb81986 100644
--- a/src/com/android/settings/wifi/WifiScanModeActivity.java
+++ b/src/com/android/settings/wifi/WifiScanModeActivity.java
@@ -24,6 +24,8 @@ import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -43,7 +45,13 @@ public class WifiScanModeActivity extends Activity {
         if (savedInstanceState == null) {
             if (intent != null && intent.getAction()
                     .equals(WifiManager.ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE)) {
+                ApplicationInfo ai;
                 mApp = getCallingPackage();
+                try {
+                    PackageManager pm = getPackageManager();
+                    ai = pm.getApplicationInfo(mApp, 0);
+                    mApp = (String)pm.getApplicationLabel(ai);
+                } catch (PackageManager.NameNotFoundException e) { }
             } else {
                 finish();
                 return;
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 24f56c1b4a9..1caf58bcd1c 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -19,6 +19,10 @@ package com.android.settings.wifi;
 import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID;
 import static android.os.UserManager.DISALLOW_CONFIG_WIFI;
 
+import com.android.settings.R;
+import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.wifi.p2p.WifiP2pSettings;
+
 import android.app.ActionBar;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -30,6 +34,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
+import android.content.res.TypedArray;
 import android.location.LocationManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
@@ -43,12 +48,10 @@ import android.net.wifi.WpsInfo;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
-import android.telephony.TelephonyManager;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.ContextMenu;
@@ -71,10 +74,6 @@ import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.wifi.p2p.WifiP2pSettings;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -90,7 +89,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * The second is for Setup Wizard, with a simplified interface that hides the action bar
  * and menus.
  */
-public class WifiSettings extends SettingsPreferenceFragment
+public class WifiSettings extends RestrictedSettingsFragment
         implements DialogInterface.OnClickListener  {
     private static final String TAG = "WifiSettings";
     private static final int MENU_ID_WPS_PBC = Menu.FIRST;
@@ -129,9 +128,6 @@ public class WifiSettings extends SettingsPreferenceFragment
     private WifiManager.ActionListener mForgetListener;
     private boolean mP2pSupported;
 
-
-    private UserManager mUserManager;
-
     private WifiEnabler mWifiEnabler;
     // An access point being editted is stored here.
     private AccessPoint mSelectedAccessPoint;
@@ -139,7 +135,7 @@ public class WifiSettings extends SettingsPreferenceFragment
     private DetailedState mLastState;
     private WifiInfo mLastInfo;
 
-    private AtomicBoolean mConnected = new AtomicBoolean(false);
+    private final AtomicBoolean mConnected = new AtomicBoolean(false);
 
     private WifiDialog mDialog;
 
@@ -179,6 +175,7 @@ public class WifiSettings extends SettingsPreferenceFragment
     /* End of "used in Wifi Setup context" */
 
     public WifiSettings() {
+        super(DISALLOW_CONFIG_WIFI);
         mFilter = new IntentFilter();
         mFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
         mFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
@@ -292,7 +289,6 @@ public class WifiSettings extends SettingsPreferenceFragment
 
         mP2pSupported = getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT);
         mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
-        mUserManager = (UserManager) getSystemService(Context.USER_SERVICE);
 
         mConnectListener = new WifiManager.ActionListener() {
                                    @Override
@@ -449,13 +445,14 @@ public class WifiSettings extends SettingsPreferenceFragment
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         // If the user is not allowed to configure wifi, do not show the menu.
-        if (mUserManager.hasUserRestriction(DISALLOW_CONFIG_WIFI)) return;
+        if (isRestrictedAndNotPinProtected()) return;
 
         final boolean wifiIsEnabled = mWifiManager.isWifiEnabled();
+        TypedArray ta = getActivity().getTheme().obtainStyledAttributes(
+                new int[] {R.attr.ic_menu_add, R.attr.ic_wps});
         if (mSetupWizardMode) {
-            // FIXME: add setIcon() when graphics are available
             menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)
-                    .setIcon(R.drawable.ic_wps)
+                    .setIcon(ta.getDrawable(1))
                     .setEnabled(wifiIsEnabled)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
             menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
@@ -463,11 +460,11 @@ public class WifiSettings extends SettingsPreferenceFragment
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         } else {
             menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)
-                    .setIcon(R.drawable.ic_wps)
+                    .setIcon(ta.getDrawable(1))
                     .setEnabled(wifiIsEnabled)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
             menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
-                    .setIcon(R.drawable.ic_menu_add)
+                    .setIcon(ta.getDrawable(0))
                     .setEnabled(wifiIsEnabled)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
             menu.add(Menu.NONE, MENU_ID_SCAN, 0, R.string.wifi_menu_scan)
@@ -486,6 +483,7 @@ public class WifiSettings extends SettingsPreferenceFragment
                     //.setIcon(android.R.drawable.ic_menu_manage)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
         }
+        ta.recycle();
         super.onCreateOptionsMenu(menu, inflater);
     }
 
@@ -507,7 +505,7 @@ public class WifiSettings extends SettingsPreferenceFragment
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         // If the user is not allowed to configure wifi, do not handle menu selections.
-        if (mUserManager.hasUserRestriction(DISALLOW_CONFIG_WIFI)) return false;
+        if (isRestrictedAndNotPinProtected()) return false;
 
         switch (item.getItemId()) {
             case MENU_ID_WPS_PBC:
@@ -709,7 +707,7 @@ public class WifiSettings extends SettingsPreferenceFragment
         // Safeguard from some delayed event handling
         if (getActivity() == null) return;
 
-        if (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_WIFI)) {
+        if (isRestrictedAndNotPinProtected()) {
             addMessagePreference(R.string.wifi_empty_list_user_restricted);
             return;
         }
@@ -813,7 +811,7 @@ public class WifiSettings extends SettingsPreferenceFragment
 
     /** A restricted multimap for use in constructAccessPoints */
     private class Multimap<K,V> {
-        private HashMap<K,List<V>> store = new HashMap<K,List<V>>();
+        private final HashMap<K,List<V>> store = new HashMap<K,List<V>>();
         /** retrieve a non-null list of values with key K */
         List<V> getAll(K key) {
             List<V> values = store.get(key);
diff --git a/src/com/android/settings/wifi/WifiSetupActivity.java b/src/com/android/settings/wifi/WifiSetupActivity.java
index 84159544159..1739750d7dd 100644
--- a/src/com/android/settings/wifi/WifiSetupActivity.java
+++ b/src/com/android/settings/wifi/WifiSetupActivity.java
@@ -17,7 +17,25 @@ package com.android.settings.wifi;
 
 import com.android.settings.ButtonBarHandler;
 
-// dummy class for setup wizard theme
-public class WifiSetupActivity extends WifiPickerActivity implements ButtonBarHandler {
+import android.content.res.Resources;
 
-}
\ No newline at end of file
+public class WifiSetupActivity extends WifiPickerActivity implements ButtonBarHandler {
+    // Extra containing the resource name of the theme to be used
+    private static final String EXTRA_THEME = "theme";
+    private static final String THEME_HOLO = "holo";
+    private static final String THEME_HOLO_LIGHT = "holo_light";
+
+    // Style resources containing theme settings
+    private static final String RESOURCE_THEME_DARK = "SetupWizardWifiTheme";
+    private static final String RESOURCE_THEME_LIGHT = "SetupWizardWifiTheme.Light";
+
+    @Override
+    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+        String themeName = getIntent().getStringExtra(EXTRA_THEME);
+        if (themeName != null && themeName.equalsIgnoreCase(THEME_HOLO_LIGHT)) {
+            resid = getResources().getIdentifier(RESOURCE_THEME_LIGHT, "style",
+                    getPackageName());
+        }
+        super.onApplyThemeResource(theme, resid, first);
+    }
+}
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
index 1eb810eb68e..a364021dd5f 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
@@ -20,21 +20,18 @@ import com.android.settings.R;
 
 import android.content.Context;
 import android.net.wifi.WifiManager;
-import android.net.wifi.p2p.WifiP2pManager;
 import android.net.wifi.p2p.WifiP2pDevice;
 import android.preference.Preference;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 
-import java.util.Comparator;
-
 public class WifiP2pPeer extends Preference {
 
     private static final int[] STATE_SECURED = {R.attr.state_encrypted};
     public WifiP2pDevice device;
 
-    private int mRssi;
+    private final int mRssi;
     private ImageView mSignal;
 
     private static final int SIGNAL_LEVELS = 4;
@@ -57,7 +54,7 @@ public class WifiP2pPeer extends Preference {
         if (mRssi == Integer.MAX_VALUE) {
             mSignal.setImageDrawable(null);
         } else {
-            mSignal.setImageResource(R.drawable.wifi_signal);
+            mSignal.setImageResource(R.drawable.wifi_signal_dark);
             mSignal.setImageState(STATE_SECURED,  true);
         }
         refresh();
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index 63ef549d60e..cd1d721712c 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -83,6 +83,7 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
     private OnClickListener mDeleteGroupListener;
     private WifiP2pPeer mSelectedWifiPeer;
     private WifiP2pPersistentGroup mSelectedGroup;
+    private String mSelectedGroupName;
     private EditText mDeviceNameText;
 
     private boolean mWifiP2pEnabled;
@@ -102,6 +103,7 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
 
     private static final String SAVE_DIALOG_PEER = "PEER_STATE";
     private static final String SAVE_DEVICE_NAME = "DEV_NAME";
+    private static final String SAVE_SELECTED_GROUP = "GROUP_NAME";
 
     private WifiP2pDevice mThisDevice;
     private WifiP2pDeviceList mPeers = new WifiP2pDeviceList();
@@ -160,6 +162,10 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
         }
     };
 
+    public WifiP2pSettings() {
+        if (DBG) Log.d(TAG, "Creating WifiP2pSettings ...");
+    }
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         addPreferencesFromResource(R.xml.wifi_p2p_settings);
@@ -191,6 +197,9 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
         if (savedInstanceState != null && savedInstanceState.containsKey(SAVE_DEVICE_NAME)) {
             mSavedDeviceName = savedInstanceState.getString(SAVE_DEVICE_NAME);
         }
+        if (savedInstanceState != null && savedInstanceState.containsKey(SAVE_SELECTED_GROUP)) {
+            mSelectedGroupName = savedInstanceState.getString(SAVE_SELECTED_GROUP);
+        }
 
         mRenameListener = new OnClickListener() {
             @Override
@@ -259,17 +268,28 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
             public void onClick(DialogInterface dialog, int which) {
                 if (which == DialogInterface.BUTTON_POSITIVE) {
                     if (mWifiP2pManager != null) {
-                        mWifiP2pManager.deletePersistentGroup(mChannel,
-                                mSelectedGroup.getNetworkId(),
-                                new WifiP2pManager.ActionListener() {
-                            public void onSuccess() {
-                                if (DBG) Log.d(TAG, " delete group success");
-                            }
-                            public void onFailure(int reason) {
-                                if (DBG) Log.d(TAG, " delete group fail " + reason);
-                            }
-                        });
+                        if (mSelectedGroup != null) {
+                            if (DBG) Log.d(TAG, " deleting group " + mSelectedGroup.getGroupName());
+                            mWifiP2pManager.deletePersistentGroup(mChannel,
+                                    mSelectedGroup.getNetworkId(),
+                                    new WifiP2pManager.ActionListener() {
+                                public void onSuccess() {
+                                    if (DBG) Log.d(TAG, " delete group success");
+                                }
+                                public void onFailure(int reason) {
+                                    if (DBG) Log.d(TAG, " delete group fail " + reason);
+                                }
+                            });
+                            mSelectedGroup = null;
+                        } else {
+                            if (DBG) Log.w(TAG, " No selected group to delete!" );
+                        }
                     }
+                } else if (which == DialogInterface.BUTTON_NEGATIVE) {
+                    if (DBG) {
+                        Log.d(TAG, " forgetting selected group " + mSelectedGroup.getGroupName());
+                    }
+                    mSelectedGroup = null;
                 }
             }
         };
@@ -453,8 +473,8 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
             AlertDialog dialog = new AlertDialog.Builder(getActivity())
                 .setMessage(getActivity().getString(stringId))
                 .setPositiveButton(getActivity().getString(R.string.dlg_ok), mDeleteGroupListener)
-                .setNegativeButton(getActivity().getString(R.string.dlg_cancel), null)
-                .create();
+                .setNegativeButton(getActivity().getString(R.string.dlg_cancel),
+                        mDeleteGroupListener).create();
             return dialog;
         }
         return null;
@@ -468,6 +488,9 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
         if (mDeviceNameText != null) {
             outState.putString(SAVE_DEVICE_NAME, mDeviceNameText.getText().toString());
         }
+        if (mSelectedGroup != null) {
+            outState.putString(SAVE_SELECTED_GROUP, mSelectedGroup.getGroupName());
+        }
     }
 
     private void handlePeersChanged() {
@@ -488,7 +511,20 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
 
         for (WifiP2pGroup group: groups.getGroupList()) {
             if (DBG) Log.d(TAG, " group " + group);
-            mPersistentGroup.addPreference(new WifiP2pPersistentGroup(getActivity(), group));
+            WifiP2pPersistentGroup wppg = new WifiP2pPersistentGroup(getActivity(), group);
+            mPersistentGroup.addPreference(wppg);
+            if (wppg.getGroupName().equals(mSelectedGroupName)) {
+                if (DBG) Log.d(TAG, "Selecting group " + wppg.getGroupName());
+                mSelectedGroup = wppg;
+                mSelectedGroupName = null;
+            }
+        }
+        if (mSelectedGroupName != null) {
+            // Looks like there's a dialog pending getting user confirmation to delete the
+            // selected group. When user hits OK on that dialog, we won't do anything; but we
+            // shouldn't be in this situation in first place, because these groups are persistent
+            // groups and they shouldn't just get deleted!
+            Log.w(TAG, " Selected group " + mSelectedGroupName + " disappered on next query ");
         }
     }
 
diff --git a/tests/res/values-ca/strings.xml b/tests/res/values-ca/strings.xml
index d988ebbf0a3..8ddac7df0bf 100644
--- a/tests/res/values-ca/strings.xml
+++ b/tests/res/values-ca/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="3169265480789026010">"Detectable"</string>
+    <string name="discoverable" msgid="3169265480789026010">"Visible"</string>
     <string name="start_scan" msgid="6035699220942169744">"Inicia la cerca"</string>
     <string name="stop_scan" msgid="527546916633745779">"Atura la cerca"</string>
     <string name="operator_hello" msgid="292208161864910159">"Hola, Operador!"</string>