diff --git a/Android.mk b/Android.mk
index 0663e85..8b6532c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,10 +6,13 @@
 
 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 7025a9c..49fe4d5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -64,6 +64,8 @@
     <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"
@@ -512,7 +514,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 +524,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 +534,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 +549,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"
@@ -803,10 +805,8 @@
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.APP_OPS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <!-- Not yet ready to expose.
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
-                -->
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.applications.AppOpsSummary" />
@@ -967,7 +967,7 @@
                 <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>
diff --git a/res/layout/preference_app_restrictions.xml b/res/layout/preference_app_restrictions.xml
index a8a93d1..753099d 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_dialog_ringervolume.xml b/res/layout/preference_dialog_ringervolume.xml
index 1643cab..2af1ba9 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">
 
-                <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" />
+                        <ImageView android:id="@+id/media_mute_button"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:padding="16dip"
+                                android:background="?android:attr/selectableItemBackground"
+                                android:contentDescription="@string/volume_media_mute"
+                            />
+
+                        <SeekBar android:id="@+id/media_volume_seekbar"
+                                android:layout_width="0dip"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:paddingTop="2dip"
+                                android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
+                </LinearLayout>
+
         </LinearLayout>
 
         <!-- Used for the ringer/notification volume -->
@@ -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/user_dictionary_add_word_fullscreen.xml b/res/layout/user_dictionary_add_word_fullscreen.xml
index b72886f..42bd197 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/values-af/arrays.xml b/res/values-af/arrays.xml
index d688c58..07094a4 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 4c0c3d7..55aae33 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 443bad2..485369f 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 90a7122..ffb530d 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 aaa29c7..0cb3074 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 a8d6b48..4d7b686 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 b4fbef2..8671375 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>
+    <item msgid="886742181977884584">"Медыя"</item>
+    <item msgid="7924928667052300589">"Прылада"</item>
   </string-array>
-  <string-array name="app_ops_summaries">
-    <item msgid="4979188868761515915">"прыблiзнае месцазнаходжанне"</item>
-    <item msgid="5789673140227507995">"дакладнае месцазнаходжанне"</item>
-    <item msgid="1061584358377390581">"GPS"</item>
-    <item msgid="5387405117297558954">"вібрацыя"</item>
-    <item msgid="3434165993711230924">"чытанне кантактаў"</item>
-    <item msgid="616161687718081936">"змяніць кантакты"</item>
-    <item msgid="7638002295329050091">"чытанне гiсторыi выклікаў"</item>
-    <item msgid="6546959730920410907">"змены ў гiсторыi выклікаў"</item>
-    <item msgid="446877710771379667">"чытанне календара"</item>
-    <item msgid="7674458294386319722">"змяніць каляндар"</item>
-    <item msgid="8281201165558093009">"сканаванне Wi-Fi"</item>
-    <item msgid="8694611243479480497">"апавяшчэнне"</item>
-    <item msgid="7776439107987345446">"сканаванне па сотавым"</item>
-    <item msgid="514615766544675057">"патэлефанаваць па нумары"</item>
-    <item msgid="8181415497109310680">"чытаць SMS"</item>
-    <item msgid="6816551144382117307">"напісаць SMS"</item>
-    <item msgid="4600463921908905030">"атрымліваць SMS"</item>
-    <item msgid="5958926493289432745">"атрымліваць экстранныя SMS"</item>
-    <item msgid="4945269495221089540">"атрымліваць MMS"</item>
-    <item msgid="5570472453573929087">"атрымаць WAP Push"</item>
-    <item msgid="7125408150230860501">"Адправiць SMS"</item>
-    <item msgid="7080337936612188061">"чытанне ICC SMS"</item>
-    <item msgid="587124103118495063">"напiсаць ICC SMS"</item>
-    <item msgid="2320577158869025503">"змяніць налады"</item>
-    <item msgid="1545733463471924009">"намалюйце ўверсе"</item>
-    <item msgid="3609046903962454582">"доступ да паведамленняў"</item>
-    <item msgid="4671646036128214513">"камера"</item>
-    <item msgid="1097324338692486211">"запісваць аўдыё"</item>
-    <item msgid="5031552983987798163">"прайграць аўдыё"</item>
-    <item msgid="8374996688066472414">"счытаць буфер абмену"</item>
-    <item msgid="3045529469061083747">"змяніць буфер абмену"</item>
-  </string-array>
-  <string-array name="app_ops_labels">
-    <item msgid="6602854600289714121">"Месцазнаходжанне"</item>
-    <item msgid="8677040780775113033">"Месцазнаходжанне"</item>
-    <item msgid="1660743989948992916">"Месцазнаходжанне"</item>
-    <item msgid="8791172739860195290">"Вібрацыя"</item>
-    <item msgid="383413555642128046">"Чытанне кантактаў"</item>
-    <item msgid="3654594895269697313">"Змяніць кантакты"</item>
-    <item msgid="7928393476362362538">"Чытанне гiсторыi выклікаў"</item>
-    <item msgid="6248591205254641116">"Змяненне запісаў у гiсторыi выклікаў"</item>
-    <item msgid="6093344633066170692">"Чытанне календара"</item>
-    <item msgid="1334886368750347692">"Змена календара"</item>
-    <item msgid="1638204101698708656">"Месцазнаходжанне"</item>
-    <item msgid="2154671955760380322">"Апублiкаваць апавяшчэнне"</item>
-    <item msgid="4282477730595931828">"Месцазнаходжанне"</item>
-    <item msgid="4891423912898525905">"Патэлефанаваць па нумары"</item>
-    <item msgid="626463821668200388">"Прыём SMS/MMS"</item>
-    <item msgid="1237538540368797101">"Адправiць SMS/MMS"</item>
-    <item msgid="3986142739951490025">"Прыём SMS/MMS"</item>
-    <item msgid="3984213795861739778">"Прыём SMS/MMS"</item>
-    <item msgid="3656243523752472788">"Прыём SMS/MMS"</item>
-    <item msgid="8105802370238551510">"Прыём SMS/MMS"</item>
-    <item msgid="1407766984645388488">"Адправiць SMS/MMS"</item>
-    <item msgid="1530132603376027248">"Прыём SMS/MMS"</item>
-    <item msgid="1188256962149204607">"Адправiць SMS/MMS"</item>
-    <item msgid="4218544235221631789">"Змена налад"</item>
-    <item msgid="736541391767350377">"Намалюйце ўверсе"</item>
-    <item msgid="5530815681721654194">"Доступ да паведамленняў"</item>
-    <item msgid="781213371706962767">"Камера"</item>
-    <item msgid="1720492593061838172">"Запісаць аўдыё"</item>
-    <item msgid="3493046322001257041">"Прайграванне аўдыё"</item>
-    <item msgid="136815868796597058">"Счытаць буфер абмену"</item>
-    <item msgid="5238692940326972503">"Змяніць буфер абмену"</item>
-  </string-array>
+    <!-- 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 0399ab6..de9994e 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -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>
@@ -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,12 @@
     <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 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>
@@ -1325,6 +1330,8 @@
     <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="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>
@@ -1371,6 +1378,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 +1437,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 +1494,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>
@@ -1681,8 +1711,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>
@@ -1880,6 +1909,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 10d6f2a..2f75b39 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 621ceea..27aa06a 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 02cadad..938f74d 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 e462178..343c284 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 0fa7e05..fda9dcd 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 4d91c65..f7d0f19 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 1dd8178..45cd4fb 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 48d6699..a2025db 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 9035730..19b3de5 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 021ef10..d9bbe98 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1321,6 +1323,8 @@
     <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="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>
@@ -1367,6 +1371,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 +1420,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 +1477,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>
@@ -1677,8 +1694,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>
@@ -1876,6 +1892,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 6a2ceb1..e51007e 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 7eaca17..646facc 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 6576fa7..cff546a 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 ff59985..5a309b7 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 ce76840..420ddaf 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 15305e8..957c797 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 fe1cf2e..7616c68 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 b6565b3..e4ee4fa 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 e72eb1d..9ad5ef1 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 ef83418..7b295a2 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 76de88b..b9656b0 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 163e562..ba71191 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 a07a248..1511b42 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 06cf740..17ec413 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 b044807..f892846 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 24e2991..4d2ef70 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1877,6 +1893,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 6ae78a9..678b837 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 fb6bb2e..aca357b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 0335e8c..6ef5fdc 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 2ca8e96..3f32307 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 8903742..0971951 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 670fd2d..4c0c428 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1877,6 +1893,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 baa34d0..b2a7df5 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 f6f9149..2c353b5 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 8763dc4..f1d1469 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 c04ac26..32346ca 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 63566bb..11e95a2 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 6014192..afe4038 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 21f877d..f2b40b2 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 8bb0b0a..0aaf258 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1322,6 +1324,8 @@
     <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="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>
@@ -1368,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>
@@ -1407,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>
@@ -1462,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>
@@ -1682,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">"HWオーバーレイを無効"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"画面合成に常にGPUを使用する"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGLトレースを有効化"</string>
@@ -1881,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-ko/arrays.xml b/res/values-ko/arrays.xml
index ab1d5f8..862e628 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 951fccd..1b8ac56 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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-lt/arrays.xml b/res/values-lt/arrays.xml
index 2fde167..9581200 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 70ee336..b9ad50c 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 444871e..97bf2b8 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 4dc054d..fa589be 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 82d4837..fd349bc 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 7ae90d4..4854d11 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 0a2c15e..3ee445d 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 cf63a7a..4509823 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 320a2a1..69abe1a 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 ef24445..f9d1ab9 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 1a10173..8180172 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 0c665e4..ff70084 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 267fe34..5a1b002 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 71b5967..8454050 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 684b86b..0a29fd8 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 895ab3b..7af4adb 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 436d800..0b0b1c7 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 e35500b..560d916 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,12 @@
     <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 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 +2042,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 +2125,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 +2198,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 +2279,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 +2668,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 +3063,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 3d909a8..74f8f83 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 728a56b..5fdff24 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1321,6 +1323,8 @@
     <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="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>
@@ -1367,6 +1371,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 +1420,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 +1477,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>
@@ -1677,8 +1694,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>
@@ -1876,6 +1892,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 c63f13d..3960a26 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 52d027c..25a55b5 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1877,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-sk/arrays.xml b/res/values-sk/arrays.xml
index 6ab5e68..41f8e5a 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 321c862..5d6fdc9 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 d31eb74..5e4c497 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 c34d0dd..156125d 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 8552560..e78eb2b 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 2874765..0dc66f7 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 941aee8..802a30f 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 7d1db19..e7c98de 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 d7c0c7b..5525a54 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -31,7 +31,7 @@
   </string-array>
   <string-array name="screen_timeout_entries">
     <item msgid="3342301044271143016">"Sekunde 15"</item>
-    <item msgid="8881760709354815449">"sekunde 30"</item>
+    <item msgid="8881760709354815449">"Sekunde 30"</item>
     <item msgid="7589406073232279088">"Dakika 1"</item>
     <item msgid="7001195990902244174">"Dakika 2"</item>
     <item msgid="7489864775127957179">"Dakika 5"</item>
@@ -41,7 +41,7 @@
   <string-array name="dream_timeout_entries">
     <item msgid="3149294732238283185">"Katu"</item>
     <item msgid="2194151041885903260">"Sekunde 15"</item>
-    <item msgid="5892295237131074341">"sekunde 30"</item>
+    <item msgid="5892295237131074341">"Sekunde 30"</item>
     <item msgid="3538441365970038213">"Dakika 1"</item>
     <item msgid="412343871668955639">"Dakika 2"</item>
     <item msgid="5076853889688991690">"Dakika 5"</item>
@@ -55,7 +55,7 @@
     <item msgid="1822002388249545488">"Sekunde 30"</item>
     <item msgid="8538071621211916519">"Dakika 1"</item>
     <item msgid="5663439580228932882">"Dakika 2"</item>
-    <item msgid="49888496216106852">"dakika 5"</item>
+    <item msgid="49888496216106852">"Dakika 5"</item>
     <item msgid="9002737361305019353">"Dakika 10"</item>
     <item msgid="4322676235684793329">"Dakika 30"</item>
   </string-array>
@@ -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 9e516a2..bbe1091 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1314,6 +1316,8 @@
     <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="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>
@@ -1360,6 +1364,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 +1413,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 +1470,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>
@@ -1670,8 +1687,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>
@@ -1869,6 +1885,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 1374efd..4f4a221 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -24,7 +24,7 @@
     <dimen name="content_margin_left">16dip</dimen>
     <dimen name="description_margin_top">26dip</dimen>
     <dimen name="crypt_clock_size">120sp</dimen>
-    <dimen name="setup_title_size">60sp</dimen>
+    <dimen name="setup_title_size">60dp</dimen>
     <item type="dimen" name="setup_title_height">20%</item>
     <item type="dimen" name="setup_border_width">10%</item>
     <dimen name="setup_margin_bottom">0dip</dimen>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 9f02164..21f9ae3 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>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 324463d..1a68c71 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 719ee10..2d50276 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 bf7da47..80985ae 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 43541fd..69cdc20 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 31b15f0..e052fd1 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 60dd0ea..f18b525 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 86ed51b..664e678 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 de4af9e..d187007 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 82ff460..b44f15d 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 7a49a79..90dc0bc 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 723b979..6592f61 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 19ec2a6..7face9d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1676,8 +1693,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>
@@ -1875,6 +1891,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 a7f70da..e034012 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 887bc63..a9685bba 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1320,6 +1322,8 @@
     <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="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>
@@ -1366,6 +1370,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 +1419,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 +1476,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>
@@ -1680,8 +1697,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>
@@ -1879,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-zu/arrays.xml b/res/values-zu/arrays.xml
index 605e32d..6be3864 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -30,8 +30,8 @@
     <item msgid="8392017019801393511">"Konke"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"amasekhondi angu-15"</item>
-    <item msgid="8881760709354815449">"amasekhondi angu-30"</item>
+    <item msgid="3342301044271143016">"15 amasekhondi"</item>
+    <item msgid="8881760709354815449">"30 amasekhondi"</item>
     <item msgid="7589406073232279088">"1 iminithi"</item>
     <item msgid="7001195990902244174">"2 amaminithi"</item>
     <item msgid="7489864775127957179">"amaminithii angu-5"</item>
@@ -50,9 +50,9 @@
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="8929270399652145290">"Ngokushesha"</item>
-    <item msgid="6736512735606834431">"amasekhondi angu-5"</item>
-    <item msgid="8044619388267891375">"amasekhondi angu-15"</item>
-    <item msgid="1822002388249545488">"amasekhondi angu-30"</item>
+    <item msgid="6736512735606834431">"5 amasekhondi"</item>
+    <item msgid="8044619388267891375">"15 amasekhondi"</item>
+    <item msgid="1822002388249545488">"30 amasekhondi"</item>
     <item msgid="8538071621211916519">"1 iminithi"</item>
     <item msgid="5663439580228932882">"2 amaminithi"</item>
     <item msgid="49888496216106852">"5 amaminithi"</item>
@@ -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 0611c7f..c5c2b7f 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -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>
@@ -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,9 @@
     <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="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>
@@ -1327,6 +1329,8 @@
     <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="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>
@@ -1373,6 +1377,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 +1426,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 +1483,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>
@@ -1683,8 +1700,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>
@@ -1882,6 +1898,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 1a11ebb..99a2e91 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>
 
 
@@ -589,6 +591,7 @@
         <item>Location</item>
         <item>Personal</item>
         <item>Messaging</item>
+        <item>Media</item>
         <item>Device</item>
     </string-array>
 
@@ -625,6 +628,17 @@
         <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>
     </string-array>
 
     <!-- User display names for app ops codes -->
@@ -660,6 +674,17 @@
         <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>
     </string-array>
 
     <!-- Titles for the list of long press timeout options. -->
@@ -679,6 +704,27 @@
         <item>1500</item>
     </string-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>
@@ -830,6 +876,20 @@
         <item>true</item>
     </string-array>
 
+    <!-- Titles for debug overdraw preference. [CHAR LIMIT=35] -->
+    <string-array name="debug_hw_overdraw_entries">
+        <item>Off</item>
+        <item>Show overdraw areas</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>count</item>
+    </string-array>
+
     <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
     <string-array name="app_process_limit_entries">
         <item>Standard limit</item>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index aa40096..d68342d 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -39,7 +39,7 @@
     <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>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6d181b5..1d2ba38 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1012,7 +1012,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.
@@ -1221,6 +1221,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>
 
@@ -2944,13 +2946,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>
@@ -3076,6 +3074,18 @@
     <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 allow mock locations -->
     <string name="allow_mock_location">Allow mock locations</string>
     <!-- setting Checkbox summary whether to allow mock locations  -->
@@ -3113,6 +3123,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. -->
@@ -3201,9 +3216,9 @@
     <!-- 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 a warning about security implications of enabling an accessibility
@@ -3244,6 +3259,40 @@
     <!-- 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">Printing settings</string>
+    <!-- Title for the printing preference category of print services. [CHAR LIMIT=25] -->
+    <string name="print_services_title">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">
+         <xliff:g id="print_service_name">%1$s</xliff:g> can receive documents you print.
+         Such documents may contain sensitive data.</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 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>
+
     <!-- App Fuel Gauge strings -->
     <skip />
 
@@ -3328,10 +3377,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 -->
@@ -3451,8 +3504,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 -->
@@ -3988,9 +4044,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>
@@ -4441,6 +4495,15 @@
     <!-- Warning message title for global font change [CHAR LIMIT=40] -->
     <string name="global_font_change_title">Change font size</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>
 
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index fa447f2..e2328d3 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -28,7 +28,7 @@
             android:title="@string/accessibility_system_title">
 
         <PreferenceScreen
-            android:fragment="com.android.settings.AccessibilitySettings$ToggleScreenMagnificationPreferenceFragment"
+            android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment"
             android:key="screen_magnification_preference_screen"
             android:title="@string/accessibility_screen_magnification_title"/>
 
@@ -53,7 +53,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/development_prefs.xml b/res/xml/development_prefs.xml
index 72b73bb..db003d3 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -38,6 +38,13 @@
         android:summary="@string/keep_screen_on_summary"/>
 
     <ListPreference
+        android:key="select_runtime"
+        android:title="@string/select_runtime_title"
+        android:dialogTitle="@string/select_runtime_dialog_title"
+        android:entries="@array/select_runtime_titles"
+        android:entryValues="@array/select_runtime_values" />
+
+    <ListPreference
         android:key="hdcp_checking"
         android:title="@string/hdcp_checking_title"
         android:dialogTitle="@string/hdcp_checking_dialog_title"
@@ -49,6 +56,11 @@
         android:title="@string/enforce_read_external_title"
         android:summary="@string/enforce_read_external_summary" />
 
+    <CheckBoxPreference
+        android:key="bt_hci_snoop_log"
+        android:title="@string/bt_hci_snoop_log"
+        android:summary="@string/bt_hci_snoop_log_summary"/>
+
     <PreferenceCategory android:key="debug_debugging_category"
             android:title="@string/debug_debugging_category">
 
@@ -61,6 +73,11 @@
                 android:title="@string/clear_adb_keys" />
 
         <CheckBoxPreference
+            android:key="enable_terminal"
+            android:title="@string/enable_terminal_title"
+            android:summary="@string/enable_terminal_summary" />
+
+        <CheckBoxPreference
             android:key="bugreport_in_power"
             android:title="@string/bugreport_in_power"
             android:summary="@string/bugreport_in_power_summary"/>
@@ -161,10 +178,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"
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index f001486..3e7fdb5 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -29,7 +29,8 @@
 
     <!-- User dictionary preference title and fragment will be set programmatically. -->
     <PreferenceScreen
-            android:key="key_user_dictionary_settings" />
+            android:key="key_user_dictionary_settings"
+            android:title="@string/user_dict_settings_title" />
 
     <PreferenceCategory android:key="keyboard_settings_category"
             android:title="@string/keyboard_settings_category">
diff --git a/res/xml/print_settings.xml b/res/xml/print_settings.xml
new file mode 100644
index 0000000..b21f2ac
--- /dev/null
+++ b/res/xml/print_settings.xml
@@ -0,0 +1,26 @@
+<?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="services_category"
+            android:title="@string/print_services_title">
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 05fa31f..5d3a39f 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -97,6 +97,13 @@
         android:title="@string/applications_settings"
         android:id="@+id/application_settings" />
 
+    <!-- Manage restrictions -->
+    <header
+        android:fragment="com.android.settings.users.RestrictionSettings"
+        android:icon="@drawable/ic_settings_multiuser"
+        android:title="@string/restriction_settings_title"
+        android:id="@+id/restriction_settings" />
+
     <!-- Manage users -->
     <header
         android:fragment="com.android.settings.users.UserSettings"
@@ -171,10 +178,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.PrintingSettings"
+        android:icon="@drawable/ic_settings_accessibility"
+        android:title="@string/print_settings" />
+
     <!-- Development -->
     <header
         android:id="@+id/development_settings"
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
deleted file mode 100644
index ea4940e..0000000
--- 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/BatteryInfo.java b/src/com/android/settings/BatteryInfo.java
index 3f88277..d35771f 100644
--- a/src/com/android/settings/BatteryInfo.java
+++ b/src/com/android/settings/BatteryInfo.java
@@ -22,6 +22,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.BatteryManager;
+import android.os.BatteryStats;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IPowerManager;
@@ -163,7 +164,8 @@
         mUptime = (TextView) findViewById(R.id.uptime);
         
         // Get awake time plugged in and on battery
-        mBatteryStats = IBatteryStats.Stub.asInterface(ServiceManager.getService("batteryinfo"));
+        mBatteryStats = IBatteryStats.Stub.asInterface(ServiceManager.getService(
+                BatteryStats.SERVICE_NAME));
         mScreenStats = IPowerManager.Stub.asInterface(ServiceManager.getService(POWER_SERVICE));
         mHandler.sendEmptyMessageDelayed(EVENT_TICK, 1000);
         
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 14671d1..8db5a75 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -28,6 +28,7 @@
 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;
@@ -122,6 +123,9 @@
                 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);
diff --git a/src/com/android/settings/CreateShortcut.java b/src/com/android/settings/CreateShortcut.java
index 0312a4b..f71df1d 100644
--- a/src/com/android/settings/CreateShortcut.java
+++ b/src/com/android/settings/CreateShortcut.java
@@ -18,10 +18,15 @@
 
 import android.app.LauncherActivity;
 import android.content.Intent;
+import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ListView;
 
+import com.android.settings.Settings.TetherSettingsActivity;
+
+import java.util.List;
+
 public class CreateShortcut extends LauncherActivity {
 
     @Override
@@ -49,4 +54,22 @@
     protected boolean onEvaluateShowIcons() {
         return false;
     }
+
+    /**
+     * Perform query on package manager for list items.  The default
+     * implementation queries for activities.
+     */
+    protected List<ResolveInfo> onQueryPackageManager(Intent queryIntent) {
+        List<ResolveInfo> activities = super.onQueryPackageManager(queryIntent);
+        if (activities == null) return null;
+        for (int i = activities.size() - 1; i >= 0; i--) {
+            ResolveInfo info = activities.get(i);
+            if (info.activityInfo.name.endsWith(TetherSettingsActivity.class.getSimpleName())) {
+                if (!TetherSettings.showInShortcuts(this)) {
+                    activities.remove(i);
+                }
+            }
+        }
+        return activities;
+    }
 }
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 4597bf0..8ed9a7e 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -27,6 +27,7 @@
 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 +35,7 @@
 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,12 +44,12 @@
 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;
@@ -67,6 +69,9 @@
 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;
@@ -91,7 +96,11 @@
 
     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";
@@ -118,7 +127,7 @@
     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 WINDOW_ANIMATION_SCALE_KEY = "window_animation_scale";
     private static final String TRANSITION_ANIMATION_SCALE_KEY = "transition_animation_scale";
@@ -141,6 +150,8 @@
 
     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,9 +165,11 @@
 
     private CheckBoxPreference mEnableAdb;
     private Preference mClearAdbKeys;
+    private CheckBoxPreference mEnableTerminal;
     private Preference mBugreport;
     private CheckBoxPreference mBugreportInPower;
     private CheckBoxPreference mKeepScreenOn;
+    private CheckBoxPreference mBtHciSnoopLog;
     private CheckBoxPreference mEnforceReadExternal;
     private CheckBoxPreference mAllowMockLocation;
     private PreferenceScreen mPassword;
@@ -176,8 +189,8 @@
     private CheckBoxPreference mForceMsaa;
     private CheckBoxPreference mShowHwScreenUpdates;
     private CheckBoxPreference mShowHwLayersUpdates;
-    private CheckBoxPreference mShowHwOverdraw;
     private CheckBoxPreference mDebugLayout;
+    private ListPreference mDebugHwOverdraw;
     private ListPreference mTrackFrameTime;
     private ListPreference mShowNonRectClip;
     private ListPreference mWindowAnimationScale;
@@ -223,19 +236,26 @@
 
         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);
+        mBtHciSnoopLog = findAndInitCheckboxPref(BT_HCI_SNOOP_LOG);
         mEnforceReadExternal = findAndInitCheckboxPref(ENFORCE_READ_EXTERNAL);
         mAllowMockLocation = findAndInitCheckboxPref(ALLOW_MOCK_LOCATION);
         mPassword = (PreferenceScreen) findPreference(LOCAL_BACKUP_PASSWORD);
@@ -244,6 +264,7 @@
         if (!android.os.Process.myUserHandle().equals(UserHandle.OWNER)) {
             disableForUser(mEnableAdb);
             disableForUser(mClearAdbKeys);
+            disableForUser(mEnableTerminal);
             disableForUser(mPassword);
         }
 
@@ -252,8 +273,6 @@
         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 +291,8 @@
         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);
+        mDebugHwOverdraw = addListPreference(DEBUG_HW_OVERDRAW_KEY);
         mWindowAnimationScale = addListPreference(WINDOW_ANIMATION_SCALE_KEY);
         mTransitionAnimationScale = addListPreference(TRANSITION_ANIMATION_SCALE_KEY);
         mAnimatorDurationScale = addListPreference(ANIMATOR_DURATION_SCALE_KEY);
@@ -302,11 +321,19 @@
             }
         }
 
+        Preference selectRuntime = findPreference(SELECT_RUNTIME_KEY);
+        if (selectRuntime != null) {
+            mAllPrefs.add(selectRuntime);
+            if (!removePreferenceForProduction(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 +397,17 @@
         activity.getActionBar().setCustomView(null);
     }
 
-    private void removeHdcpOptionsForProduction() {
+    private boolean removePreferenceForProduction(Preference preference) {
         if ("user".equals(Build.TYPE)) {
-            Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);
-            if (hdcpChecking != null) {
-                // Remove the preference
-                getPreferenceScreen().removePreference(hdcpChecking);
-                mAllPrefs.remove(hdcpChecking);
-            }
+            removePreference(preference);
+            return true;
         }
+        return false;
+    }
+
+    private void removePreference(Preference preference) {
+        getPreferenceScreen().removePreference(preference);
+        mAllPrefs.remove(preference);
     }
 
     private void setPrefsEnabledState(boolean enabled) {
@@ -443,13 +472,21 @@
         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(mBtHciSnoopLog, Settings.Secure.getInt(cr,
+                Settings.Secure.BLUETOOTH_HCI_LOG, 0) != 0);
         updateCheckBox(mEnforceReadExternal, isPermissionEnforced(READ_EXTERNAL_STORAGE));
         updateCheckBox(mAllowMockLocation, Settings.Secure.getInt(cr,
                 Settings.Secure.ALLOW_MOCK_LOCATION, 0) != 0);
+        updateRuntimeValue();
         updateHdcpValues();
         updatePasswordSummary();
         updateDebuggerOptions();
@@ -464,7 +501,7 @@
         updateShowNonRectClipOptions();
         updateShowHwScreenUpdatesOptions();
         updateShowHwLayersUpdatesOptions();
-        updateShowHwOverdrawOptions();
+        updateDebugHwOverdrawOptions();
         updateDebugLayoutOptions();
         updateAnimationScaleOptions();
         updateOverlayDisplayDevicesOptions();
@@ -498,13 +535,60 @@
         pokeSystemProperties();
     }
 
+    void filterRuntimeOptions(Preference selectRuntime) {
+        ListPreference pref = (ListPreference) selectRuntime;
+        ArrayList<String> validValues = new ArrayList<String>();
+        ArrayList<String> validSummaries = new ArrayList<String>();
+        String[] values = getResources().getStringArray(R.array.select_runtime_values);
+        String[] summaries = getResources().getStringArray(R.array.select_runtime_summaries);
+        for (int i = 0; i < values.length; i++) {
+            String value = values[i];
+            String summary = summaries[i];
+            if (new File("/system/lib/" + value).exists()) {
+                validValues.add(value);
+                validSummaries.add(summary);
+            }
+        }
+        int count = validValues.size();
+        if (count <= 1) {
+            // no choices, so remove preference
+            removePreference(selectRuntime);
+        } else {
+            pref.setEntryValues(validValues.toArray(new String[count]));
+            pref.setEntries(validSummaries.toArray(new String[count]));
+        }
+    }
+
+    private String currentRuntimeValue() {
+        return SystemProperties.get(SELECT_RUNTIME_PROPERTY, VMRuntime.getRuntime().vmLibrary());
+    }
+
+    private void updateRuntimeValue() {
+        ListPreference selectRuntime = (ListPreference) findPreference(SELECT_RUNTIME_KEY);
+        if (selectRuntime != null) {
+            String currentValue = currentRuntimeValue();
+            String[] values = getResources().getStringArray(R.array.select_runtime_values);
+            String[] summaries = getResources().getStringArray(R.array.select_runtime_summaries);
+            int index = 0;
+            for (int i = 0; i < values.length; i++) {
+                if (currentValue.equals(values[i])) {
+                    index = i;
+                    break;
+                }
+            }
+            selectRuntime.setValue(values[index]);
+            selectRuntime.setSummary(summaries[index]);
+            selectRuntime.setOnPreferenceChangeListener(this);
+        }
+    }
+
     private void updateHdcpValues() {
-        int index = 1; // Defaults to drm-only. Needs to match with R.array.hdcp_checking_values
         ListPreference hdcpChecking = (ListPreference) findPreference(HDCP_CHECKING_KEY);
         if (hdcpChecking != null) {
             String currentValue = SystemProperties.get(HDCP_CHECKING_PROPERTY);
             String[] values = getResources().getStringArray(R.array.hdcp_checking_values);
             String[] summaries = getResources().getStringArray(R.array.hdcp_checking_summaries);
+            int index = 1; // Defaults to drm-only. Needs to match with R.array.hdcp_checking_values
             for (int i = 0; i < values.length; i++) {
                 if (currentValue.equals(values[i])) {
                     index = i;
@@ -529,6 +613,14 @@
         }
     }
 
+    private void writeBtHciSnoopLogOptions() {
+        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        adapter.configHciSnoopLog(mBtHciSnoopLog.isChecked());
+        Settings.Secure.putInt(getActivity().getContentResolver(),
+                Settings.Secure.BLUETOOTH_HCI_LOG,
+                mBtHciSnoopLog.isChecked() ? 1 : 0);
+    }
+
     private void writeDebuggerOptions() {
         try {
             ActivityManagerNative.getDefault().setDebugApp(
@@ -820,15 +912,29 @@
         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() {
@@ -1001,16 +1107,14 @@
 
     private void writeExperimentalWebViewOptions() {
         if (mExperimentalWebView != null) {
-            SystemProperties.set(WebViewFactory.WEBVIEW_EXPERIMENTAL_PROPERTY,
-                    mExperimentalWebView.isChecked() ? "true" : null);
+            WebViewFactory.setUseExperimentalWebView(mExperimentalWebView.isChecked());
             pokeSystemProperties();
         }
     }
 
     private void updateExperimentalWebViewOptions() {
         if (mExperimentalWebView != null) {
-            updateCheckBox(mExperimentalWebView, SystemProperties.getBoolean(
-                    WebViewFactory.WEBVIEW_EXPERIMENTAL_PROPERTY, false));
+            updateCheckBox(mExperimentalWebView, WebViewFactory.useExperimentalWebView());
         }
     }
 
@@ -1087,6 +1191,11 @@
                         .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, 
@@ -1096,6 +1205,8 @@
                     Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
                     mKeepScreenOn.isChecked() ? 
                     (BatteryManager.BATTERY_PLUGGED_AC | BatteryManager.BATTERY_PLUGGED_USB) : 0);
+        } else if (preference == mBtHciSnoopLog) {
+            writeBtHciSnoopLogOptions();
         } else if (preference == mEnforceReadExternal) {
             if (mEnforceReadExternal.isChecked()) {
                 ConfirmEnforceFragment.show(this);
@@ -1138,8 +1249,6 @@
             writeShowHwScreenUpdatesOptions();
         } else if (preference == mShowHwLayersUpdates) {
             writeShowHwLayersUpdatesOptions();
-        } else if (preference == mShowHwOverdraw) {
-            writeShowHwOverdrawOptions();
         } else if (preference == mDebugLayout) {
             writeDebugLayoutOptions();
         }
@@ -1149,7 +1258,34 @@
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (HDCP_CHECKING_KEY.equals(preference.getKey())) {
+        if (SELECT_RUNTIME_KEY.equals(preference.getKey())) {
+            final String oldRuntimeValue = VMRuntime.getRuntime().vmLibrary();
+            final String newRuntimeValue = newValue.toString();
+            if (!newRuntimeValue.equals(oldRuntimeValue)) {
+                final Context context = getActivity();
+                final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+                builder.setMessage(context.getResources().getString(R.string.select_runtime_warning_message,
+                                                                    oldRuntimeValue, newRuntimeValue));
+                builder.setPositiveButton(android.R.string.ok, new OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        SystemProperties.set(SELECT_RUNTIME_PROPERTY, newRuntimeValue);
+                        pokeSystemProperties();
+                        PowerManager pm = (PowerManager)
+                                context.getSystemService(Context.POWER_SERVICE);
+                        pm.reboot(null);
+                    }
+                });
+                builder.setNegativeButton(android.R.string.cancel, new OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        updateRuntimeValue();
+                    }
+                });
+                builder.show();
+            }
+            return true;
+        } else if (HDCP_CHECKING_KEY.equals(preference.getKey())) {
             SystemProperties.set(HDCP_CHECKING_PROPERTY, newValue.toString());
             updateHdcpValues();
             pokeSystemProperties();
@@ -1172,6 +1308,9 @@
         } else if (preference == mTrackFrameTime) {
             writeTrackFrameTimeOptions(newValue);
             return true;
+        } else if (preference == mDebugHwOverdraw) {
+            writeDebugHwOverdrawOptions(newValue);
+            return true;
         } else if (preference == mShowNonRectClip) {
             writeShowNonRectClipOptions(newValue);
             return true;
@@ -1343,4 +1482,12 @@
             throw new RuntimeException("Problem talking with PackageManager", e);
         }
     }
+
+    private static boolean isPackageInstalled(Context context, String packageName) {
+        try {
+            return context.getPackageManager().getPackageInfo(packageName, 0) != null;
+        } catch (NameNotFoundException e) {
+            return false;
+        }
+    }
 }
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index fb839a7..6c3a990 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -95,9 +95,11 @@
 
         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);
         }
 
diff --git a/src/com/android/settings/EventLogTags.logtags b/src/com/android/settings/EventLogTags.logtags
new file mode 100644
index 0000000..3e87c53
--- /dev/null
+++ b/src/com/android/settings/EventLogTags.logtags
@@ -0,0 +1,6 @@
+# See system/core/logcat/event.logtags for a description of the format of this file.
+
+option java_package com.android.settings
+
+# log the type of screen lock when user sets lock screen
+90200 lock_screen_type (type|3)
diff --git a/src/com/android/settings/KeyguardAppWidgetPickActivity.java b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
index 8e08019..f3db2ca 100644
--- a/src/com/android/settings/KeyguardAppWidgetPickActivity.java
+++ b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
@@ -517,8 +517,8 @@
                     // 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/MasterClear.java b/src/com/android/settings/MasterClear.java
index 495f3fd..3777a8e 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -29,6 +29,7 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.SystemProperties;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.util.Log;
@@ -54,6 +55,7 @@
     private static final String TAG = "MasterClear";
 
     private static final int KEYGUARD_REQUEST = 55;
+    private static final int PIN_REQUEST = 56;
 
     static final String ERASE_EXTERNAL_EXTRA = "erase_sd";
 
@@ -61,6 +63,7 @@
     private Button mInitiateButton;
     private View mExternalStorageContainer;
     private CheckBox mExternalStorage;
+    private boolean mPinConfirmed;
 
     /**
      * Keyguard validation is run using the standard {@link ConfirmLockPattern}
@@ -76,11 +79,25 @@
                         res.getText(R.string.master_clear_gesture_explanation));
     }
 
+    private boolean runRestrictionsChallenge() {
+        if (UserManager.get(getActivity()).hasRestrictionsPin()) {
+            startActivityForResult(
+                    new Intent(Intent.ACTION_RESTRICTIONS_PIN_CHALLENGE), PIN_REQUEST);
+            return true;
+        }
+        return false;
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if (requestCode != KEYGUARD_REQUEST) {
+        if (requestCode == PIN_REQUEST) {
+            if (resultCode == Activity.RESULT_OK) {
+                mPinConfirmed = true;
+            }
+            return;
+        } else if (requestCode != KEYGUARD_REQUEST) {
             return;
         }
 
@@ -109,6 +126,10 @@
     private final Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
 
         public void onClick(View v) {
+            mPinConfirmed = false;
+            if (runRestrictionsChallenge()) {
+                return;
+            }
             if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
                 showFinalConfirmation();
             }
@@ -239,4 +260,17 @@
         establishInitialState();
         return mContentView;
     }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // If this is the second step after restrictions pin challenge
+        if (mPinConfirmed) {
+            mPinConfirmed = false;
+            if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
+                showFinalConfirmation();
+            }
+        }
+    }
 }
diff --git a/src/com/android/settings/PrintingSettings.java b/src/com/android/settings/PrintingSettings.java
new file mode 100644
index 0000000..723bdc9
--- /dev/null
+++ b/src/com/android/settings/PrintingSettings.java
@@ -0,0 +1,587 @@
+/*
+ * 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.ActionBar;
+import android.app.Activity;
+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.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.PreferenceActivity;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceScreen;
+import android.printservice.PrintServiceInfo;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.text.TextUtils.SimpleStringSplitter;
+import android.view.Gravity;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Switch;
+import android.widget.TextView;
+
+import com.android.internal.content.PackageMonitor;
+import com.android.settings.PrintingSettings.ToggleSwitch.OnBeforeCheckedChangeListener;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Activity with the printing settings.
+ */
+public class PrintingSettings extends SettingsPreferenceFragment implements DialogCreatable {
+
+    private static final char ENABLED_PRINT_SERVICES_SEPARATOR = ':';
+
+    // Preference categories
+    private static final String SERVICES_CATEGORY = "services_category";
+
+    // 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_ENABLE_WARNING_TITLE = "enable_warning_title";
+    private static final String EXTRA_ENABLE_WARNING_MESSAGE = "enable_warning_message";
+    private static final String EXTRA_SETTINGS_TITLE = "settings_title";
+    private static final String EXTRA_SETTINGS_COMPONENT_NAME = "settings_component_name";
+    private static final String EXTRA_ADD_PRINTERS_TITLE = "add_printers_title";
+    private static final String EXTRA_ADD_PRINTERS_COMPONENT_NAME = "add_printers_component_name";
+    private static final String EXTRA_SERVICE_COMPONENT_NAME = "service_component_name";
+
+    // Auxiliary members.
+    private final static SimpleStringSplitter sStringColonSplitter =
+            new SimpleStringSplitter(ENABLED_PRINT_SERVICES_SEPARATOR);
+
+    private static final List<ResolveInfo> sInstalledServicesList = new ArrayList<ResolveInfo>();
+
+    private static final Set<ComponentName> sEnabledServiceNameSet = new HashSet<ComponentName>();
+
+    private final PackageMonitor mSettingsPackageMonitor = new SettingsPackageMonitor();
+
+    private final Handler mHandler = new Handler() {
+        @Override
+        public void dispatchMessage(Message msg) {
+            super.dispatchMessage(msg);
+            loadInstalledServices(getActivity());
+            loadEnabledServices(getActivity());
+            updateServicesPreferences();
+        }
+    };
+
+    private final SettingsContentObserver mSettingsContentObserver =
+            new SettingsContentObserver(mHandler) {
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            loadInstalledServices(getActivity());
+            loadEnabledServices(getActivity());
+            updateServicesPreferences();
+        }
+    };
+
+    // Preference controls.
+    private PreferenceCategory mServicesCategory;
+
+    private Preference mNoServicesMessagePreference;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        addPreferencesFromResource(R.xml.print_settings);
+        mServicesCategory = (PreferenceCategory) findPreference(SERVICES_CATEGORY);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
+        mSettingsContentObserver.register(getContentResolver());
+        loadInstalledServices(getActivity());
+        loadEnabledServices(getActivity());
+        updateServicesPreferences();
+    }
+
+    @Override
+    public void onPause() {
+        mSettingsPackageMonitor.unregister();
+        mSettingsContentObserver.unregister(getContentResolver());
+        super.onPause();
+    }
+
+    private void updateServicesPreferences() {
+        // Since services category is auto generated we have to do a pass
+        // to generate it since services can come and go.
+        mServicesCategory.removeAll();
+
+       final int installedServiceCount = sInstalledServicesList.size();
+        for (int i = 0; i < installedServiceCount; i++) {
+            ResolveInfo installedService = sInstalledServicesList.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());
+
+            final boolean serviceEnabled = sEnabledServiceNameSet.contains(componentName);
+            if (serviceEnabled) {
+                preference.setSummary(getString(R.string.print_feature_state_on));
+            } else {
+                preference.setSummary(getString(R.string.print_feature_state_off));
+            }
+
+            preference.setOrder(i);
+            preference.setFragment(TogglePrintServicePreferenceFragment.class.getName());
+            preference.setPersistent(false);
+
+            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());
+
+            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.print_no_services_installed);
+                        summaryView.setText(title);
+                    }
+                };
+                mNoServicesMessagePreference.setPersistent(false);
+                mNoServicesMessagePreference.setLayoutResource(
+                        R.layout.text_description_preference);
+                mNoServicesMessagePreference.setSelectable(false);
+            }
+            mServicesCategory.addPreference(mNoServicesMessagePreference);
+        }
+    }
+
+    private static void loadInstalledServices(Context context) {
+        sInstalledServicesList.clear();
+        List<ResolveInfo> resolveInfos = context.getPackageManager().queryIntentServices(
+                    new Intent(android.printservice.PrintService.SERVICE_INTERFACE),
+                    PackageManager.GET_SERVICES | PackageManager.GET_META_DATA);
+        final int resolveInfoCount = resolveInfos.size();
+        for (int i = 0, count = resolveInfoCount; i < count; i++) {
+            ResolveInfo resolveInfo = resolveInfos.get(i);
+            sInstalledServicesList.add(resolveInfo);
+        }
+    }
+
+    private static void loadEnabledServices(Context context) {
+        sEnabledServiceNameSet.clear();
+
+        String enabledServicesSetting = Settings.Secure.getString(context
+                .getContentResolver(), Settings.Secure.ENABLED_PRINT_SERVICES);
+        if (enabledServicesSetting == null) {
+            enabledServicesSetting = "";
+        }
+
+        SimpleStringSplitter colonSplitter = sStringColonSplitter;
+        colonSplitter.setString(enabledServicesSetting);
+
+        while (colonSplitter.hasNext()) {
+            String componentNameString = colonSplitter.next();
+            ComponentName enabledService = ComponentName.unflattenFromString(
+                    componentNameString);
+            sEnabledServiceNameSet.add(enabledService);
+        }
+    }
+
+    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);
+        }
+    }
+
+    public static class TogglePrintServicePreferenceFragment
+            extends ToggleFeaturePreferenceFragment implements DialogInterface.OnClickListener {
+
+        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) {
+                String settingValue = Settings.Secure.getString(getContentResolver(),
+                        Settings.Secure.ENABLED_PRINT_SERVICES);
+                final boolean enabled = settingValue.contains(mComponentName);
+                mToggleSwitch.setCheckedInternal(enabled);
+            }
+        };
+
+        private CharSequence mEnableWarningTitle;
+        private CharSequence mEnableWarningMessage;
+
+        private String mComponentName;
+
+        @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) {
+            Set<ComponentName> enabledServices = sEnabledServiceNameSet;
+            ComponentName toggledService = ComponentName.unflattenFromString(preferenceKey);
+            if (enabled) {
+                enabledServices.add(toggledService);
+            } else {
+                enabledServices.remove(toggledService);
+            }
+            StringBuilder enabledServicesBuilder = new StringBuilder();
+            for (ComponentName enabledService : enabledServices) {
+                enabledServicesBuilder.append(enabledService.flattenToString());
+                enabledServicesBuilder.append(ENABLED_PRINT_SERVICES_SEPARATOR);
+            }
+            final int enabledServicesBuilderLength = enabledServicesBuilder.length();
+            if (enabledServicesBuilderLength > 0) {
+                enabledServicesBuilder.deleteCharAt(enabledServicesBuilderLength - 1);
+            }
+            Settings.Secure.putString(getContentResolver(),
+                    Settings.Secure.ENABLED_PRINT_SERVICES,
+                    enabledServicesBuilder.toString());
+        }
+
+        @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(EXTRA_CHECKED, checked);
+                    onPreferenceToggled(mPreferenceKey, checked);
+                    break;
+                case DialogInterface.BUTTON_NEGATIVE:
+                    checked = false;
+                    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) {
+                        if (!TextUtils.isEmpty(mEnableWarningMessage)) {
+                            toggleSwitch.setCheckedInternal(false);
+                            getArguments().putBoolean(EXTRA_CHECKED, false);
+                            showDialog(DIALOG_ID_ENABLE_WARNING);
+                            return true;
+                        }
+                        onPreferenceToggled(mPreferenceKey, true);
+                    } else {
+                        onPreferenceToggled(mPreferenceKey, false);
+                    }
+                    return false;
+                }
+            });
+        }
+
+        @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);
+                }
+            }
+            // Add printers title and intent.
+            String addPrintersTitle = arguments.getString(EXTRA_ADD_PRINTERS_TITLE);
+            String addPrintersComponentName =
+                    arguments.getString(EXTRA_ADD_PRINTERS_COMPONENT_NAME);
+            if (!TextUtils.isEmpty(addPrintersTitle)
+                    && !TextUtils.isEmpty(addPrintersComponentName)) {
+                Intent addPritnersIntent = new Intent(Intent.ACTION_MAIN).setComponent(
+                        ComponentName.unflattenFromString(addPrintersComponentName.toString()));
+                if (!getPackageManager().queryIntentActivities(addPritnersIntent, 0).isEmpty()) {
+                    mAddPrintersTitle = addPrintersTitle;
+                    mAddPrintersIntent = addPritnersIntent;
+                    setHasOptionsMenu(true);
+                }
+            }
+            // Enable warning title.
+            mEnableWarningTitle = arguments.getCharSequence(
+                    PrintingSettings.EXTRA_ENABLE_WARNING_TITLE);
+            // Enable warning message.
+            mEnableWarningMessage = arguments.getCharSequence(
+                    PrintingSettings.EXTRA_ENABLE_WARNING_MESSAGE);
+            // Component name.
+            mComponentName = arguments.getString(EXTRA_SERVICE_COMPONENT_NAME);
+        }
+    }
+
+    public static abstract class ToggleFeaturePreferenceFragment
+            extends SettingsPreferenceFragment {
+
+        protected ToggleSwitch mToggleSwitch;
+
+        protected String mPreferenceKey;
+
+        protected CharSequence mSettingsTitle;
+        protected Intent mSettingsIntent;
+
+        protected CharSequence mAddPrintersTitle;
+        protected Intent mAddPrintersIntent;
+
+        // 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);
+        }
+
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
+            onInstallActionBarToggleSwitch();
+            onProcessArguments(getArguments());
+            getListView().setDivider(null);
+            getListView().setEnabled(false);
+        }
+
+        @Override
+        public void onDestroyView() {
+            getActivity().getActionBar().setCustomView(null);
+            if (mOldActivityTitle != null) {
+                getActivity().getActionBar().setTitle(mOldActivityTitle);
+            }
+            mToggleSwitch.setOnBeforeCheckedChangeListener(null);
+            super.onDestroyView();
+        }
+
+        protected abstract void onPreferenceToggled(String preferenceKey, boolean enabled);
+
+        @Override
+        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+            super.onCreateOptionsMenu(menu, inflater);
+            if (!TextUtils.isEmpty(mSettingsTitle) && mSettingsIntent != null) {
+                MenuItem menuItem = menu.add(mSettingsTitle);
+                menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+                menuItem.setIntent(mSettingsIntent);
+            }
+            if (!TextUtils.isEmpty(mAddPrintersTitle) && mAddPrintersIntent != null) {
+                MenuItem menuItem = menu.add(mAddPrintersTitle);
+                menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+                menuItem.setIntent(mAddPrintersIntent);
+            }
+        }
+
+        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);
+            }
+        }
+    }
+
+    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);
+    }
+}
diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 56393e0..dd81ded 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -80,6 +80,13 @@
         R.id.alarm_mute_button
     };
 
+    private static final int[] SEEKBAR_SECTION_ID = new int[] {
+        R.id.media_section,
+        R.id.ringer_section,
+        R.id.notification_section,
+        R.id.alarm_section
+    };
+
     private static final int[] SEEKBAR_MUTED_RES_ID = new int[] {
         com.android.internal.R.drawable.ic_audio_vol_mute,
         com.android.internal.R.drawable.ic_audio_ring_notif_mute,
@@ -198,15 +205,33 @@
             getContext().registerReceiver(mRingModeChangedReceiver, filter);
         }
 
-        // Disable either ringer+notifications or notifications
-        int id;
-        if (!Utils.isVoiceCapable(getContext())) {
-            id = R.id.ringer_section;
+        boolean useMasterVolume = getContext().getResources().
+                getBoolean(com.android.internal.R.bool.config_useMasterVolume);
+        if (useMasterVolume) {
+            // If config_useMasterVolume is true, all streams are treated as STREAM_MASTER.
+            // So hide all except a stream.
+            int id;
+            if (Utils.isVoiceCapable(getContext())) {
+                id = R.id.ringer_section;
+            } else {
+                id = R.id.media_section;
+            }
+            for (int i = 0; i < SEEKBAR_SECTION_ID.length; i++) {
+                if (SEEKBAR_SECTION_ID[i] != id) {
+                    view.findViewById(SEEKBAR_SECTION_ID[i]).setVisibility(View.GONE);
+                }
+            }
         } else {
-            id = R.id.notification_section;
+            // Disable either ringer+notifications or notifications
+            int id;
+            if (!Utils.isVoiceCapable(getContext())) {
+                id = R.id.ringer_section;
+            } else {
+                id = R.id.notification_section;
+            }
+            View hideSection = view.findViewById(id);
+            hideSection.setVisibility(View.GONE);
         }
-        View hideSection = view.findViewById(id);
-        hideSection.setVisibility(View.GONE);
     }
 
     private Uri getMediaVolumeUri(Context context) {
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 02769e1..e90b1cd 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -19,9 +19,11 @@
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.OnAccountsUpdateListener;
+import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.RestrictionEntry;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
@@ -51,7 +53,7 @@
 import android.widget.TextView;
 
 import com.android.internal.util.ArrayUtils;
-import com.android.settings.AccessibilitySettings.ToggleAccessibilityServicePreferenceFragment;
+import com.android.settings.accessibility.ToggleAccessibilityServicePreferenceFragment;
 import com.android.settings.accounts.AccountSyncSettings;
 import com.android.settings.accounts.AuthenticatorHelper;
 import com.android.settings.accounts.ManageAccountsSettings;
@@ -114,13 +116,15 @@
             R.id.location_settings,
             R.id.security_settings,
             R.id.language_settings,
+            R.id.restriction_settings,
             R.id.user_settings,
             R.id.account_settings,
             R.id.account_add,
             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
     };
 
     private SharedPreferences mDevelopmentPreferences;
@@ -134,6 +138,23 @@
     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 +239,16 @@
             ((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();
@@ -439,6 +464,12 @@
                 } 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);
@@ -456,6 +487,11 @@
                 if (um.hasUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS)) {
                     target.remove(i);
                 }
+            } else if (id == R.id.restriction_settings) {
+                if (um.isLinkedUser()
+                        || um.hasUserRestriction(UserManager.DISALLOW_APP_RESTRICTIONS)) {
+                    target.remove(i);
+                }
             }
 
             if (i < target.size() && target.get(i) == header
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index d2c99dc..f0b6b44 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -38,6 +38,8 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.SystemProperties;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
@@ -590,4 +592,17 @@
     public int getHelpResource() {
         return R.string.help_url_tether;
     }
+
+    /**
+     * Checks whether this screen will have anything to show on this device. This is called by
+     * the shortcut picker for Settings shortcuts (home screen widget).
+     * @param context a context object for getting a system service.
+     * @return whether Tether & portable hotspot should be shown in the shortcuts picker.
+     */
+    public static boolean showInShortcuts(Context context) {
+        final ConnectivityManager cm =
+                (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        final boolean isSecondaryUser = UserHandle.myUserId() != UserHandle.USER_OWNER;
+        return !isSecondaryUser && cm.isTetheringSupported();
+    }
 }
diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index b561ed4..9f6df50 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -16,30 +16,21 @@
 
 package com.android.settings;
 
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
 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;
@@ -47,6 +38,7 @@
 import android.widget.TextView;
 
 import com.android.settings.inputmethod.UserDictionaryAddWordContents;
+import com.android.settings.inputmethod.UserDictionarySettingsUtils;
 
 import java.util.Locale;
 
@@ -82,6 +74,7 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        getActivity().getActionBar().setTitle(R.string.user_dict_settings_title);
     }
 
     @Override
@@ -123,7 +116,9 @@
         listView.setEmptyView(emptyView);
 
         setHasOptionsMenu(true);
-
+        // Show the language as a subtitle of the action bar
+        getActivity().getActionBar().setSubtitle(
+                UserDictionarySettingsUtils.getLocaleDisplayName(getActivity(), mLocale));
     }
 
     private Cursor createCursor(final String locale) {
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index f031f0a..58c0872 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -386,17 +386,22 @@
         }
     }
 
+    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);
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 8124b3b..1f29927 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -258,6 +258,11 @@
             removePreference(KEY_MANAGE_MOBILE_PLAN);
         }
 
+        // 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);
         DevicePolicyManager mDPM = (DevicePolicyManager)
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
new file mode 100644
index 0000000..d2198a7
--- /dev/null
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -0,0 +1,622 @@
+/*
+ * 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.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.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 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 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 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]);
+            }
+        }
+
+        // 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));
+
+        // 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);
+                                        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);
+        }
+    }
+}
diff --git a/src/com/android/settings/accessibility/AccessibilityUtils.java b/src/com/android/settings/accessibility/AccessibilityUtils.java
new file mode 100644
index 0000000..fd4a34f
--- /dev/null
+++ b/src/com/android/settings/accessibility/AccessibilityUtils.java
@@ -0,0 +1,37 @@
+package com.android.settings.accessibility;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.provider.Settings;
+import android.provider.Settings.Secure;
+import android.text.TextUtils.SimpleStringSplitter;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * TODO: Insert description here. (generated by alanv)
+ */
+public class AccessibilityUtils {
+
+    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 = AccessibilitySettings.sStringColonSplitter;
+        colonSplitter.setString(enabledServicesSetting);
+        while (colonSplitter.hasNext()) {
+            String componentNameString = colonSplitter.next();
+            ComponentName enabledService = ComponentName.unflattenFromString(
+                    componentNameString);
+            if (enabledService != null) {
+                enabledServices.add(enabledService);
+            }
+        }
+        return enabledServices;
+    }
+
+}
diff --git a/src/com/android/settings/accessibility/SettingsContentObserver.java b/src/com/android/settings/accessibility/SettingsContentObserver.java
new file mode 100644
index 0000000..c3baec5
--- /dev/null
+++ b/src/com/android/settings/accessibility/SettingsContentObserver.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.ContentResolver;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.provider.Settings;
+
+abstract class SettingsContentObserver extends ContentObserver {
+    public SettingsContentObserver(Handler handler) {
+        super(handler);
+    }
+
+    public void register(ContentResolver contentResolver) {
+        contentResolver.registerContentObserver(Settings.Secure.getUriFor(
+                Settings.Secure.ACCESSIBILITY_ENABLED), false, this);
+        contentResolver.registerContentObserver(Settings.Secure.getUriFor(
+                Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES), false, this);
+    }
+
+    public void unregister(ContentResolver contentResolver) {
+        contentResolver.unregisterContentObserver(this);
+    }
+
+    @Override
+    public abstract void onChange(boolean selfChange, Uri uri);
+}
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
new file mode 100644
index 0000000..3059dcc
--- /dev/null
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -0,0 +1,312 @@
+/*
+ * 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.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());
+
+        // 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/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
new file mode 100644
index 0000000..171b1ac
--- /dev/null
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -0,0 +1,155 @@
+/*
+ * 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;
+
+    // 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(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()) {
+            mOldActivityTitle = getActivity().getTitle();
+            String title = arguments.getString(AccessibilitySettings.EXTRA_TITLE);
+            getActivity().getActionBar().setTitle(title);
+        }
+        // Summary.
+        CharSequence summary = arguments.getCharSequence(AccessibilitySettings.EXTRA_SUMMARY);
+        mSummaryPreference.setSummary(summary);
+    }
+}
diff --git a/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
new file mode 100644
index 0000000..f4ac2cc
--- /dev/null
+++ b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.provider.Settings;
+
+import com.android.settings.accessibility.ToggleSwitch.OnBeforeCheckedChangeListener;
+
+public class ToggleGlobalGesturePreferenceFragment
+        extends ToggleFeaturePreferenceFragment {
+    @Override
+    protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
+        Settings.Global.putInt(getContentResolver(),
+                Settings.Global.ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED, enabled ? 1 : 0);
+    }
+
+    @Override
+    protected void onInstallActionBarToggleSwitch() {
+        super.onInstallActionBarToggleSwitch();
+        mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
+                @Override
+            public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
+                toggleSwitch.setCheckedInternal(checked);
+                getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, checked);
+                onPreferenceToggled(mPreferenceKey, checked);
+                return false;
+            }
+        });
+    }
+}
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
new file mode 100644
index 0000000..27d07d2
--- /dev/null
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.provider.Settings;
+
+import com.android.settings.accessibility.ToggleSwitch.OnBeforeCheckedChangeListener;
+
+public class ToggleScreenMagnificationPreferenceFragment
+        extends ToggleFeaturePreferenceFragment {
+    @Override
+    protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
+        Settings.Secure.putInt(getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, enabled ? 1 : 0);
+    }
+
+    @Override
+    protected void onInstallActionBarToggleSwitch() {
+        super.onInstallActionBarToggleSwitch();
+        mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
+                @Override
+            public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
+                toggleSwitch.setCheckedInternal(checked);
+                getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, checked);
+                onPreferenceToggled(mPreferenceKey, checked);
+                return false;
+            }
+        });
+    }
+}
diff --git a/src/com/android/settings/accessibility/ToggleSwitch.java b/src/com/android/settings/accessibility/ToggleSwitch.java
new file mode 100644
index 0000000..e7c39e4
--- /dev/null
+++ b/src/com/android/settings/accessibility/ToggleSwitch.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.Context;
+import android.widget.Switch;
+
+public class ToggleSwitch extends Switch {
+    private ToggleSwitch.OnBeforeCheckedChangeListener mOnBeforeListener;
+
+    public static interface OnBeforeCheckedChangeListener {
+        public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked);
+    }
+
+    public ToggleSwitch(Context context) {
+        super(context);
+    }
+
+    public void setOnBeforeCheckedChangeListener(OnBeforeCheckedChangeListener listener) {
+        mOnBeforeListener = listener;
+    }
+
+    @Override
+    public void setChecked(boolean checked) {
+        if (mOnBeforeListener != null
+                && mOnBeforeListener.onBeforeCheckedChanged(this, checked)) {
+            return;
+        }
+        super.setChecked(checked);
+    }
+
+    public void setCheckedInternal(boolean checked) {
+        super.setChecked(checked);
+    }
+}
diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java
index 6cdbdaf..61ed2f4 100644
--- a/src/com/android/settings/applications/AppOpsState.java
+++ b/src/com/android/settings/applications/AppOpsState.java
@@ -101,11 +101,13 @@
                     AppOpsManager.OP_FINE_LOCATION,
                     AppOpsManager.OP_GPS,
                     AppOpsManager.OP_WIFI_SCAN,
-                    AppOpsManager.OP_NEIGHBORING_CELLS },
+                    AppOpsManager.OP_NEIGHBORING_CELLS,
+                    AppOpsManager.OP_MONITOR_LOCATION },
             new boolean[] { true,
                     true,
                     false,
                     false,
+                    false,
                     false }
             );
 
@@ -149,29 +151,53 @@
                     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 b0d9ad1..4cee8e5 100644
--- a/src/com/android/settings/applications/AppOpsSummary.java
+++ b/src/com/android/settings/applications/AppOpsSummary.java
@@ -43,6 +43,7 @@
         AppOpsState.LOCATION_TEMPLATE,
         AppOpsState.PERSONAL_TEMPLATE,
         AppOpsState.MESSAGING_TEMPLATE,
+        AppOpsState.MEDIA_TEMPLATE,
         AppOpsState.DEVICE_TEMPLATE
     };
 
diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index d373fdd..94ab11d 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.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 @@
                 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 @@
                 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/deviceinfo/StorageVolumePreferenceCategory.java b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
index 61188ec..1992fac 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
@@ -137,6 +137,8 @@
     public void init() {
         final Context context = getContext();
 
+        removeAll();
+
         final UserInfo currentUser;
         try {
             currentUser = ActivityManagerNative.getDefault().getCurrentUser();
@@ -242,9 +244,6 @@
 
         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 +268,6 @@
             removePreference(mUsageBarPreference);
             removePreference(mItemTotal);
             removePreference(mItemAvailable);
-            if (mFormatPreference != null) {
-                removePreference(mFormatPreference);
-            }
         }
 
         if (mUsbConnected && (UsbManager.USB_FUNCTION_MTP.equals(mUsbFunction) ||
@@ -374,6 +370,7 @@
     }
 
     public void onStorageStateChanged() {
+        init();
         measure();
     }
 
diff --git a/src/com/android/settings/fuelgauge/BatterySipper.java b/src/com/android/settings/fuelgauge/BatterySipper.java
index 9a8e783..d581fb4 100644
--- a/src/com/android/settings/fuelgauge/BatterySipper.java
+++ b/src/com/android/settings/fuelgauge/BatterySipper.java
@@ -49,8 +49,10 @@
     long wifiRunningTime;
     long cpuFgTime;
     long wakeLockTime;
-    long tcpBytesReceived;
-    long tcpBytesSent;
+    long mobileRxBytes;
+    long mobileTxBytes;
+    long wifiRxBytes;
+    long wifiTxBytes;
     double percent;
     double noCoveragePercent;
     String defaultPackageName;
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index 8ecc659..945b86b 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -316,6 +316,8 @@
                 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;
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 2a3d5f8..5dfbcda 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -16,6 +16,11 @@
 
 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.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -24,7 +29,6 @@
 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;
@@ -53,6 +57,7 @@
 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.HelpUtils;
 import com.android.settings.R;
 import com.android.settings.fuelgauge.PowerUsageDetail.DrainType;
@@ -146,7 +151,7 @@
 
         addPreferencesFromResource(R.xml.power_usage_summary);
         mBatteryInfo = IBatteryStats.Stub.asInterface(
-                ServiceManager.getService("batteryinfo"));
+                ServiceManager.getService(BatteryStats.SERVICE_NAME));
         mUm = (UserManager)getActivity().getSystemService(Context.USER_SERVICE);
         mAppListGroup = (PreferenceGroup) findPreference(KEY_APP_LIST);
         mBatteryStatusPref = mAppListGroup.findPreference(KEY_BATTERY_STATUS);
@@ -229,8 +234,10 @@
                     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_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,
                 };
@@ -240,21 +247,25 @@
                     sipper.wakeLockTime,
                     sipper.gpsTime,
                     sipper.wifiRunningTime,
-                    sipper.tcpBytesSent,
-                    sipper.tcpBytesReceived,
+                    sipper.mobileRxBytes,
+                    sipper.mobileTxBytes,
+                    sipper.wifiRxBytes,
+                    sipper.wifiTxBytes,
                     0,
                     0
                 };
 
                 if (sipper.drainType == DrainType.APP) {
                     Writer result = new StringWriter();
-                    PrintWriter printWriter = new PrintWriter(result);
+                    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 PrintWriter(result);
+                    printWriter = new FastPrintWriter(result, false, 1024);
                     mStats.dumpCheckinLocked(printWriter, mStatsType, uid.getUid());
+                    printWriter.flush();
                     args.putString(PowerUsageDetail.EXTRA_REPORT_CHECKIN_DETAILS,
                             result.toString());
                 }
@@ -279,16 +290,20 @@
                     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,
+                    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.tcpBytesSent,
-                    sipper.tcpBytesReceived,
+                    sipper.mobileRxBytes,
+                    sipper.mobileTxBytes,
+                    sipper.wifiRxBytes,
+                    sipper.wifiTxBytes,
                 };
             } break;
             case BLUETOOTH:
@@ -298,16 +313,20 @@
                     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,
+                    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.tcpBytesSent,
-                    sipper.tcpBytesReceived,
+                    sipper.mobileRxBytes,
+                    sipper.mobileTxBytes,
+                    sipper.wifiRxBytes,
+                    sipper.wifiTxBytes,
                 };
             } break;
             default:
@@ -445,7 +464,8 @@
         for (int p = 0; p < speedSteps; p++) {
             powerCpuNormal[p] = mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_ACTIVE, p);
         }
-        final double averageCostPerByte = getAverageDataCost();
+        final double mobilePowerPerByte = getMobilePowerPerByte();
+        final double wifiPowerPerByte = getWifiPowerPerByte();
         long uSecTime = mStats.computeBatteryRealtime(SystemClock.elapsedRealtime() * 1000, which);
         long appWakelockTime = 0;
         BatterySipper osApp = null;
@@ -454,8 +474,8 @@
         final int NU = uidStats.size();
         for (int iu = 0; iu < NU; iu++) {
             Uid u = uidStats.valueAt(iu);
-            double p;
-            double power = 0;
+            double p; // in mAs
+            double power = 0; // in mAs
             double highestDrain = 0;
             String packageWithHighestDrain = null;
             //mUsageList.add(new AppUsage(u.getUid(), new double[] {power}));
@@ -535,12 +555,19 @@
             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;
+            // 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("tcp power=%.2f", 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;
@@ -602,8 +629,10 @@
                 app.wifiRunningTime = wifiRunningTimeMs;
                 app.cpuFgTime = cpuFgTime;
                 app.wakeLockTime = wakelockTime;
-                app.tcpBytesReceived = tcpBytesReceived;
-                app.tcpBytesSent = tcpBytesSent;
+                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) {
@@ -725,8 +754,10 @@
             bs.wifiRunningTime += wbs.wifiRunningTime;
             bs.cpuFgTime += wbs.cpuFgTime;
             bs.wakeLockTime += wbs.wakeLockTime;
-            bs.tcpBytesReceived += wbs.tcpBytesReceived;
-            bs.tcpBytesSent += wbs.tcpBytesSent;
+            bs.mobileRxBytes += wbs.mobileRxBytes;
+            bs.mobileTxBytes += wbs.mobileTxBytes;
+            bs.wifiRxBytes += wbs.wifiRxBytes;
+            bs.wifiTxBytes += wbs.wifiTxBytes;
         }
     }
 
@@ -768,6 +799,8 @@
     }
 
     private void addUserUsage() {
+        final Context context = getActivity();
+        if (context == null) return;
         for (int i=0; i<mUserSippers.size(); i++) {
             final int userId = mUserSippers.keyAt(i);
             final List<BatterySipper> sippers = mUserSippers.valueAt(i);
@@ -775,16 +808,16 @@
             Drawable icon;
             String name;
             if (info != null) {
-                icon = UserUtils.getUserIcon(mUm, info, getResources());
+                icon = UserUtils.getUserIcon(context, mUm, info, getResources());
                 name = info != null ? info.name : null;
                 if (name == null) {
                     name = Integer.toString(info.id);
                 }
-                name = getActivity().getResources().getString(
+                name = context.getResources().getString(
                         R.string.running_process_item_user_label, name);
             } else {
                 icon = null;
-                name = getActivity().getResources().getString(
+                name = context.getResources().getString(
                         R.string.running_process_item_removed_user_label);
             }
             double power = mUserPower.get(userId);
@@ -794,30 +827,34 @@
         }
     }
 
-    private double getAverageDataCost() {
-        final long WIFI_BPS = 1000000; // TODO: Extract average bit rates from system 
+    /**
+     * 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 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 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;
 
-        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;
-        }
+        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() {
@@ -872,6 +909,7 @@
             BatterySipper bs;
             synchronized (mRequestQueue) {
                 if (mRequestQueue.isEmpty() || mAbort) {
+                    mHandler.sendEmptyMessage(MSG_REPORT_FULLY_DRAWN);
                     mRequestThread = null;
                     return;
                 }
@@ -882,6 +920,7 @@
     }
 
     static final int MSG_UPDATE_NAME_ICON = 1;
+    static final int MSG_REPORT_FULLY_DRAWN = 2;
 
     Handler mHandler = new Handler() {
 
@@ -898,6 +937,9 @@
                         pgp.setTitle(bs.name);
                     }
                     break;
+                case MSG_REPORT_FULLY_DRAWN:
+                    getActivity().reportFullyDrawn();
+                    break;
             }
             super.handleMessage(msg);
         }
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index 2a5adb1..45b1182 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -20,10 +20,12 @@
 import com.android.settings.Settings.KeyboardLayoutPickerActivity;
 import com.android.settings.Settings.SpellCheckersSettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.UserDictionarySettings;
 import com.android.settings.Utils;
 import com.android.settings.VoiceInputOutputSettings;
 
 import android.app.Activity;
+import android.app.Fragment;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -38,6 +40,7 @@
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
@@ -83,12 +86,12 @@
             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;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -140,7 +143,7 @@
 
         // Build IME preference category.
         mImm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        mImis = mImm.getInputMethodList();
+        mInputMethodSettingValues = InputMethodSettingValuesWrapper.getInstance(getActivity());
 
         mKeyboardSettingsCategory.removeAll();
         if (!mIsOnlyImeSettings) {
@@ -151,9 +154,10 @@
         }
 
         mInputMethodPreferenceList.clear();
-        final int N = (mImis == null ? 0 : mImis.size());
+        final List<InputMethodInfo> imis = mInputMethodSettingValues.getInputMethodList();
+        final int N = (imis == null ? 0 : imis.size());
         for (int i = 0; i < N; ++i) {
-            final InputMethodInfo imi = mImis.get(i);
+            final InputMethodInfo imi = imis.get(i);
             final InputMethodPreference pref = getInputMethodPreference(imi, N);
             mInputMethodPreferenceList.add(pref);
         }
@@ -193,31 +197,41 @@
 
     private void updateUserDictionaryPreference(Preference userDictionaryPreference) {
         final Activity activity = getActivity();
-        final TreeSet<String> localeList = UserDictionaryList.getUserDictionaryLocalesSet(activity);
-        if (null == localeList) {
+        final TreeSet<String> localeSet = UserDictionaryList.getUserDictionaryLocalesSet(activity);
+        if (null == localeSet) {
             // The locale list is null if and only if the user dictionary service is
             // not present or disabled. In this case we need to remove the preference.
             getPreferenceScreen().removePreference(userDictionaryPreference);
-        } else if (localeList.size() <= 1) {
-            final Intent intent =
-                    new Intent(UserDictionaryList.USER_DICTIONARY_SETTINGS_INTENT_ACTION);
-            userDictionaryPreference.setTitle(R.string.user_dict_single_settings_title);
-            userDictionaryPreference.setIntent(intent);
-            userDictionaryPreference.setFragment(
-                    com.android.settings.UserDictionarySettings.class.getName());
-            // If the size of localeList is 0, we don't set the locale parameter in the
-            // extras. This will be interpreted by the UserDictionarySettings class as
-            // meaning "the current locale".
-            // Note that with the current code for UserDictionaryList#getUserDictionaryLocalesSet()
-            // the locale list always has at least one element, since it always includes the current
-            // locale explicitly. @see UserDictionaryList.getUserDictionaryLocalesSet().
-            if (localeList.size() == 1) {
-                final String locale = (String)localeList.toArray()[0];
-                userDictionaryPreference.getExtras().putString("locale", locale);
-            }
         } else {
-            userDictionaryPreference.setTitle(R.string.user_dict_multiple_settings_title);
-            userDictionaryPreference.setFragment(UserDictionaryList.class.getName());
+            userDictionaryPreference.setOnPreferenceClickListener(
+                    new OnPreferenceClickListener() {
+                        @Override
+                        public boolean onPreferenceClick(Preference arg0) {
+                            // Redirect to UserDictionarySettings if the user needs only one
+                            // language.
+                            final Bundle extras = new Bundle();
+                            final Class<? extends Fragment> targetFragment;
+                            if (localeSet.size() <= 1) {
+                                if (!localeSet.isEmpty()) {
+                                    // If the size of localeList is 0, we don't set the locale
+                                    // parameter in the extras. This will be interpreted by the
+                                    // UserDictionarySettings class as meaning
+                                    // "the current locale". Note that with the current code for
+                                    // UserDictionaryList#getUserDictionaryLocalesSet()
+                                    // the locale list always has at least one element, since it
+                                    // always includes the current locale explicitly.
+                                    // @see UserDictionaryList.getUserDictionaryLocalesSet().
+                                    extras.putString("locale", localeSet.first());
+                                }
+                                targetFragment = UserDictionarySettings.class;
+                            } else {
+                                targetFragment = UserDictionaryList.class;
+                            }
+                            startFragment(InputMethodAndLanguageSettings.this,
+                                    targetFragment.getCanonicalName(), -1, extras);
+                            return true;
+                        }
+                    });
         }
     }
 
@@ -278,9 +292,13 @@
 
         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);
+                this, getContentResolver(),
+                mInputMethodSettingValues.getInputMethodList(), null);
         updateActiveInputMethodsSummary();
     }
 
@@ -294,8 +312,10 @@
         if (SHOW_INPUT_METHOD_SWITCHER_SETTINGS) {
             mShowInputMethodSelectorPref.setOnPreferenceChangeListener(null);
         }
+        // TODO: Consolidate the logic to InputMethodSettingsWrapper
         InputMethodAndSubtypeUtil.saveInputMethodSubtypeList(
-                this, getContentResolver(), mImis, !mHardKeyboardPreferenceList.isEmpty());
+                this, getContentResolver(), mInputMethodSettingValues.getInputMethodList(),
+                !mHardKeyboardPreferenceList.isEmpty());
     }
 
     @Override
@@ -403,8 +423,8 @@
         if (context == null || mImm == null) return;
         final Preference curPref = getPreferenceScreen().findPreference(KEY_CURRENT_INPUT_METHOD);
         if (curPref != null) {
-            final CharSequence curIme = InputMethodAndSubtypeUtil.getCurrentInputMethodName(
-                    context, getContentResolver(), mImm, mImis, getPackageManager());
+            final CharSequence curIme =
+                    mInputMethodSettingValues.getCurrentInputMethodName(context);
             if (!TextUtils.isEmpty(curIme)) {
                 synchronized(this) {
                     curPref.setSummary(curIme);
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
index c7d8c89..918b87e 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeUtil.java
@@ -154,28 +154,6 @@
         return set;
     }
 
-    public static CharSequence getCurrentInputMethodName(Context context, ContentResolver resolver,
-            InputMethodManager imm, List<InputMethodInfo> imis, PackageManager pm) {
-        if (resolver == null || imis == null) return null;
-        final String currentInputMethodId = Settings.Secure.getString(resolver,
-                Settings.Secure.DEFAULT_INPUT_METHOD);
-        if (TextUtils.isEmpty(currentInputMethodId)) return null;
-        for (InputMethodInfo imi : imis) {
-            if (currentInputMethodId.equals(imi.getId())) {
-                final InputMethodSubtype subtype = imm.getCurrentInputMethodSubtype();
-                final CharSequence imiLabel = imi.loadLabel(pm);
-                final CharSequence summary = subtype != null
-                        ? TextUtils.concat(subtype.getDisplayName(context,
-                                    imi.getPackageName(), imi.getServiceInfo().applicationInfo),
-                                            (TextUtils.isEmpty(imiLabel) ?
-                                                    "" : " - " + imiLabel))
-                        : imiLabel;
-                return summary;
-            }
-        }
-        return null;
-    }
-
     public static void saveInputMethodSubtypeList(SettingsPreferenceFragment context,
             ContentResolver resolver, List<InputMethodInfo> inputMethodInfos,
             boolean hasHardKeyboard) {
diff --git a/src/com/android/settings/inputmethod/InputMethodSettingValuesWrapper.java b/src/com/android/settings/inputmethod/InputMethodSettingValuesWrapper.java
new file mode 100644
index 0000000..9575f72
--- /dev/null
+++ b/src/com/android/settings/inputmethod/InputMethodSettingValuesWrapper.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.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.List;
+
+/**
+ * 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 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;
+
+    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);
+            }
+        }
+    }
+
+    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);
+        }
+    }
+}
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
index 1bf68ce..2901673 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
@@ -28,8 +28,6 @@
 
 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 3251216..d81703e 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
@@ -57,6 +57,8 @@
     private String mLocale;
     private final String mOldWord;
     private final String mOldShortcut;
+    private String mSavedWord;
+    private String mSavedShortcut;
 
     /* package */ UserDictionaryAddWordContents(final View view, final Bundle args) {
         mWordEditText = (EditText)view.findViewById(R.id.user_dictionary_add_word_text);
@@ -64,7 +66,9 @@
         final String word = args.getString(EXTRA_WORD);
         if (null != word) {
             mWordEditText.setText(word);
-            mWordEditText.setSelection(word.length());
+            // Use getText in case the edit text modified the text we set. This happens when
+            // it's too long to be edited.
+            mWordEditText.setSelection(mWordEditText.getText().length());
         }
         final String shortcut = args.getString(EXTRA_SHORTCUT);
         if (null != shortcut && null != mShortcutEditText) {
@@ -76,6 +80,16 @@
         updateLocale(args.getString(EXTRA_LOCALE));
     }
 
+    /* package */ UserDictionaryAddWordContents(final View view,
+            final UserDictionaryAddWordContents oldInstanceToBeEdited) {
+        mWordEditText = (EditText)view.findViewById(R.id.user_dictionary_add_word_text);
+        mShortcutEditText = (EditText)view.findViewById(R.id.user_dictionary_add_shortcut);
+        mMode = MODE_EDIT;
+        mOldWord = oldInstanceToBeEdited.mSavedWord;
+        mOldShortcut = oldInstanceToBeEdited.mSavedShortcut;
+        updateLocale(mLocale);
+    }
+
     // locale may be null, this means default locale
     // It may also be the empty string, which means "all locales"
     /* package */ void updateLocale(final String locale) {
@@ -126,6 +140,8 @@
             // 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 @@
         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 e33333b..8f7029a 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;
@@ -51,23 +52,39 @@
     private boolean mIsDeleting = false;
 
     @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
+    public void onActivityCreated(final Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         setHasOptionsMenu(true);
+        getActivity().getActionBar().setTitle(R.string.user_dict_settings_title);
+        // Keep the instance so that we remember mContents when configuration changes (eg rotation)
+        setRetainInstance(true);
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
+    public View onCreateView(final LayoutInflater inflater, final ViewGroup container,
+            final Bundle savedState) {
         mRootView = inflater.inflate(R.layout.user_dictionary_add_word_fullscreen, null);
         mIsDeleting = false;
+        // If we have a non-null mContents object, it's the old value before a configuration
+        // change (eg rotation) so we need to use its values. Otherwise, read from the arguments.
         if (null == mContents) {
             mContents = new UserDictionaryAddWordContents(mRootView, getArguments());
+        } else {
+            // We create a new mContents object to account for the new situation : a word has
+            // been added to the user dictionary when we started rotating, and we are now editing
+            // it. That means in particular if the word undergoes any change, the old version should
+            // be updated, so the mContents object needs to switch to EDIT mode if it was in
+            // INSERT mode.
+            mContents = new UserDictionaryAddWordContents(mRootView,
+                    mContents /* oldInstanceToBeEdited */);
         }
+        getActivity().getActionBar().setSubtitle(UserDictionarySettingsUtils.getLocaleDisplayName(
+                getActivity(), mContents.getCurrentUserDictionaryLocale()));
         return mRootView;
     }
 
     @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+    public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
         MenuItem actionItem = menu.add(0, OPTIONS_MENU_DELETE, 0, R.string.delete)
                 .setIcon(android.R.drawable.ic_menu_delete);
         actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
@@ -102,13 +119,9 @@
     private void updateSpinner() {
         final ArrayList<LocaleRenderer> localesList = mContents.getLocalesList(getActivity());
 
-        final Spinner localeSpinner =
-                (Spinner)mRootView.findViewById(R.id.user_dictionary_add_locale);
         final ArrayAdapter<LocaleRenderer> adapter = new ArrayAdapter<LocaleRenderer>(getActivity(),
                 android.R.layout.simple_spinner_item, localesList);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        localeSpinner.setAdapter(adapter);
-        localeSpinner.setOnItemSelectedListener(this);
     }
 
     @Override
diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java
index 5390be6..24acb4a 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryList.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryList.java
@@ -21,45 +21,104 @@
 import com.android.settings.Utils;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceGroup;
 import android.provider.UserDictionary;
+import android.text.TextUtils;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.InputMethodSubtype;
 
+import java.util.List;
 import java.util.Locale;
 import java.util.TreeSet;
 
 public class UserDictionaryList extends SettingsPreferenceFragment {
-
     public static final String USER_DICTIONARY_SETTINGS_INTENT_ACTION =
             "android.settings.USER_DICTIONARY_SETTINGS";
+    private String mLocale;
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getActivity()));
+        getActivity().getActionBar().setTitle(R.string.user_dict_settings_title);
     }
 
-    static TreeSet<String> getUserDictionaryLocalesSet(Activity activity) {
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        final Intent intent = getActivity().getIntent();
+        final String localeFromIntent =
+                null == intent ? null : intent.getStringExtra("locale");
+
+        final Bundle arguments = getArguments();
+        final String localeFromArguments =
+                null == arguments ? null : arguments.getString("locale");
+
+        final String locale;
+        if (null != localeFromArguments) {
+            locale = localeFromArguments;
+        } else if (null != localeFromIntent) {
+            locale = localeFromIntent;
+        } else {
+            locale = null;
+        }
+        mLocale = locale;
+    }
+
+    public static TreeSet<String> getUserDictionaryLocalesSet(Activity activity) {
         @SuppressWarnings("deprecation")
         final Cursor cursor = activity.managedQuery(UserDictionary.Words.CONTENT_URI,
                 new String[] { UserDictionary.Words.LOCALE },
                 null, null, null);
-        final TreeSet<String> localeList = new TreeSet<String>();
+        final TreeSet<String> localeSet = new TreeSet<String>();
         if (null == cursor) {
             // The user dictionary service is not present or disabled. Return null.
             return null;
         } else if (cursor.moveToFirst()) {
             final int columnIndex = cursor.getColumnIndex(UserDictionary.Words.LOCALE);
             do {
-                String locale = cursor.getString(columnIndex);
-                localeList.add(null != locale ? locale : "");
+                final String locale = cursor.getString(columnIndex);
+                localeSet.add(null != locale ? locale : "");
             } while (cursor.moveToNext());
         }
-        localeList.add(Locale.getDefault().toString());
-        return localeList;
+        // CAVEAT: Keep this for consistency of the implementation between Keyboard and Settings
+        // if (!UserDictionarySettings.IS_SHORTCUT_API_SUPPORTED) {
+        //     // For ICS, we need to show "For all languages" in case that the keyboard locale
+        //     // is different from the system locale
+        //     localeSet.add("");
+        // }
+
+        final InputMethodManager imm =
+                (InputMethodManager)activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+        final List<InputMethodInfo> imis = imm.getEnabledInputMethodList();
+        for (final InputMethodInfo imi : imis) {
+            final List<InputMethodSubtype> subtypes =
+                    imm.getEnabledInputMethodSubtypeList(
+                            imi, true /* allowsImplicitlySelectedSubtypes */);
+            for (InputMethodSubtype subtype : subtypes) {
+                final String locale = subtype.getLocale();
+                if (!TextUtils.isEmpty(locale)) {
+                    localeSet.add(locale);
+                }
+            }
+        }
+
+        // We come here after we have collected locales from existing user dictionary entries and
+        // enabled subtypes. If we already have the locale-without-country version of the system
+        // locale, we don't add the system locale to avoid confusion even though it's technically
+        // correct to add it.
+        if (!localeSet.contains(Locale.getDefault().getLanguage().toString())) {
+            localeSet.add(Locale.getDefault().toString());
+        }
+
+        return localeSet;
     }
 
     /**
@@ -69,13 +128,23 @@
     protected void createUserDictSettings(PreferenceGroup userDictGroup) {
         final Activity activity = getActivity();
         userDictGroup.removeAll();
-        final TreeSet<String> localeList =
+        final TreeSet<String> localeSet =
                 UserDictionaryList.getUserDictionaryLocalesSet(activity);
+        if (mLocale != null) {
+            // If the caller explicitly specify empty string as a locale, we'll show "all languages"
+            // in the list.
+            localeSet.add(mLocale);
+        }
+        if (localeSet.size() > 1) {
+            // Have an "All languages" entry in the languages list if there are two or more active
+            // languages
+            localeSet.add("");
+        }
 
-        if (localeList.isEmpty()) {
+        if (localeSet.isEmpty()) {
             userDictGroup.addPreference(createUserDictionaryPreference(null, activity));
         } else {
-            for (String locale : localeList) {
+            for (String locale : localeSet) {
                 userDictGroup.addPreference(createUserDictionaryPreference(locale, activity));
             }
         }
diff --git a/src/com/android/settings/inputmethod/UserDictionarySettingsUtils.java b/src/com/android/settings/inputmethod/UserDictionarySettingsUtils.java
new file mode 100644
index 0000000..2238b4b
--- /dev/null
+++ b/src/com/android/settings/inputmethod/UserDictionarySettingsUtils.java
@@ -0,0 +1,34 @@
+/*
+ * 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.Utils;
+
+import android.content.Context;
+
+import java.util.Locale;
+
+/**
+ * Utilities of the user dictionary settings
+ */
+public class UserDictionarySettingsUtils {
+    public static String getLocaleDisplayName(Context context, String localeStr) {
+        final Locale locale = Utils.createLocaleFromString(localeStr);
+        final Locale systemLocale = context.getResources().getConfiguration().locale;
+        return locale.getDisplayName(systemLocale);
+    }
+}
diff --git a/src/com/android/settings/net/UidDetailProvider.java b/src/com/android/settings/net/UidDetailProvider.java
index 63672b7..aca3e5d 100644
--- a/src/com/android/settings/net/UidDetailProvider.java
+++ b/src/com/android/settings/net/UidDetailProvider.java
@@ -121,7 +121,7 @@
             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/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
index e02b6ae..bb5ac7a 100644
--- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java
+++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
@@ -22,6 +22,7 @@
 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 @@
 
     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 @@
         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 @@
             mEngineSettingsPreference.setEnabled(false);
         }
         mInstallVoicesPreference.setEnabled(false);
-
         mLocalePreference.setEnabled(false);
+
         mLocalePreference.setEntries(new CharSequence[0]);
         mLocalePreference.setEntryValues(new CharSequence[0]);
 
@@ -130,7 +130,6 @@
         mTts = new TextToSpeech(getActivity().getApplicationContext(), mTtsInitListener,
                 getEngineName());
 
-
         // Check if data packs changed
         checkTtsData();
 
@@ -172,31 +171,26 @@
         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 @@
             }
         });
 
+        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 @@
 
         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 @@
             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 @@
     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 95d3496..0e15cec 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.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.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 @@
     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 @@
     /** 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 int mCustomRequestCode;
+    private static final int CUSTOM_REQUEST_CODE_START = 1000;
+    private int mCustomRequestCode = CUSTOM_REQUEST_CODE_START;
+
     private HashMap<Integer, AppRestrictionsPreference> mCustomRequestMap =
             new HashMap<Integer,AppRestrictionsPreference>();
-    private 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 @@
             // 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 @@
         private boolean hasSettings;
         private OnClickListener listener;
         private ArrayList<RestrictionEntry> restrictions;
-        boolean panelOpen;
+        private boolean mPanelOpen;
         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 @@
             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,14 @@
             return restrictions;
         }
 
+        boolean isPanelOpen() {
+            return mPanelOpen;
+        }
+
+        List<Preference> getChildren() {
+            return mChildren;
+        }
+
         @Override
         protected void onBindView(View view) {
             super.onBindView(view);
@@ -257,139 +240,187 @@
             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());
         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,7 +472,7 @@
         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) {
                 int flags = app.activityInfo.applicationInfo.flags;
@@ -488,7 +519,7 @@
         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 +533,12 @@
         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 +554,8 @@
                     // 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) {
@@ -530,12 +566,14 @@
         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
@@ -576,11 +614,25 @@
         }
     }
 
+    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 +651,39 @@
                     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);
                     }
-                } 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 +696,6 @@
                 } else {
                     p.setOrder(MAX_APP_RESTRICTIONS * (i + 2));
                 }
-                p.setSelectableAppInfo(app);
                 mSelectedPackages.put(packageName, p.isChecked());
                 mAppListChanged = true;
                 i++;
@@ -654,10 +705,14 @@
         // 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 +732,6 @@
         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,9 +745,7 @@
 
     @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);
@@ -715,6 +759,10 @@
                     requestRestrictionsForApp(packageName, pref);
                 }
                 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 +794,6 @@
                             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);
@@ -773,11 +819,11 @@
 
     private void toggleAppPanel(AppRestrictionsPreference preference) {
         if (preference.getKey().startsWith(PKG_PREFIX)) {
-            if (preference.panelOpen) {
-                for (Preference p : preference.childPreferences) {
+            if (preference.mPanelOpen) {
+                for (Preference p : preference.mChildren) {
                     mAppList.removePreference(p);
                 }
-                preference.childPreferences.clear();
+                preference.mChildren.clear();
             } else {
                 String packageName = preference.getKey().substring(PKG_PREFIX.length());
                 if (packageName.equals(getActivity().getPackageName())) {
@@ -789,7 +835,7 @@
                     requestRestrictionsForApp(packageName, preference);
                 }
             }
-            preference.panelOpen = !preference.panelOpen;
+            preference.mPanelOpen = !preference.mPanelOpen;
         }
     }
 
@@ -826,8 +872,10 @@
             Intent restrictionsIntent = (Intent) results.getParcelable(CUSTOM_RESTRICTIONS_INTENT);
             if (restrictions != null && restrictionsIntent == null) {
                 onRestrictionsReceived(preference, packageName, restrictions);
-                mUserManager.setApplicationRestrictions(packageName,
-                        RestrictionUtils.restrictionsToBundle(restrictions), mUser);
+                if (mRestrictedProfile) {
+                    mUserManager.setApplicationRestrictions(packageName,
+                            RestrictionUtils.restrictionsToBundle(restrictions), mUser);
+                }
             } else if (restrictionsIntent != null) {
                 final Intent customIntent = restrictionsIntent;
                 if (restrictions != null) {
@@ -848,7 +896,7 @@
                 });
                 p.setPersistent(false);
                 p.setOrder(preference.getOrder() + 1);
-                preference.childPreferences.add(p);
+                preference.mChildren.add(p);
                 mAppList.addPreference(p);
                 preference.setRestrictions(restrictions);
             }
@@ -907,7 +955,7 @@
                         + entry.getKey());
                 mAppList.addPreference(p);
                 p.setOnPreferenceChangeListener(AppRestrictionsFragment.this);
-                preference.childPreferences.add(p);
+                preference.mChildren.add(p);
                 count++;
             }
         }
@@ -936,11 +984,6 @@
     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);
@@ -982,327 +1025,17 @@
         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 0000000..99e55ab
--- /dev/null
+++ b/src/com/android/settings/users/RestrictedProfileSettings.java
@@ -0,0 +1,449 @@
+/*
+ * 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.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.BitmapFactory;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.provider.MediaStore;
+import android.provider.ContactsContract.DisplayPhoto;
+import android.text.TextUtils;
+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.util.ArrayList;
+import java.util.List;
+
+public class RestrictedProfileSettings extends AppRestrictionsFragment {
+
+    private static final String KEY_SAVED_PHOTO = "pending_photo";
+    private static final int DIALOG_ID_EDIT_USER_INFO = 1;
+
+    private View mHeaderView;
+    private ImageView mUserIconView;
+    private TextView mUserNameView;
+
+    private Dialog mEditUserInfoDialog;
+    private EditUserPhotoController mEditUserPhotoController;
+    private Bitmap mSavedPhoto;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        if (icicle != null) {
+            mSavedPhoto = (Bitmap) icicle.getParcelable(KEY_SAVED_PHOTO);
+        }
+
+        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());
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        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 onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        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);
+
+            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) {
+            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/RestrictionSettings.java b/src/com/android/settings/users/RestrictionSettings.java
new file mode 100644
index 0000000..91b8bd3
--- /dev/null
+++ b/src/com/android/settings/users/RestrictionSettings.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.users;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import com.android.settings.R;
+
+import java.util.List;
+
+/**
+ * Used for restricting regular users, including single-user devices.
+ */
+public class RestrictionSettings extends AppRestrictionsFragment {
+
+    private static final int REQUEST_PIN_CHALLENGE = 10;
+
+    private static final int MENU_RESET = Menu.FIRST + 1;
+    private static final int MENU_CHANGE_PIN = Menu.FIRST + 2;
+
+    private static final String KEY_CHALLENGE_SUCCEEDED = "chsc";
+    private static final String KEY_CHALLENGE_REQUESTED = "chrq";
+
+    private boolean mChallengeSucceeded;
+    private boolean mChallengeRequested;
+    private boolean mDisableSelf;
+
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        if (UserManager.get(getActivity()).hasUserRestriction(
+                UserManager.DISALLOW_APP_RESTRICTIONS)) {
+            mDisableSelf = true;
+            return;
+        }
+        init(icicle);
+        if (icicle != null) {
+            mChallengeSucceeded = icicle.getBoolean(KEY_CHALLENGE_SUCCEEDED, false);
+            mChallengeRequested = icicle.getBoolean(KEY_CHALLENGE_REQUESTED, false);
+        }
+        setHasOptionsMenu(true);
+    }
+
+    public void onResume() {
+        super.onResume();
+        if (!mDisableSelf) {
+            ensurePin();
+        }
+    }
+
+    private void ensurePin() {
+        if (!mChallengeSucceeded) {
+            getListView().setEnabled(false);
+            final UserManager um = UserManager.get(getActivity());
+            if (!mChallengeRequested) {
+                if (um.hasRestrictionsPin()) {
+                    Intent requestPin =
+                            new Intent(Intent.ACTION_RESTRICTIONS_PIN_CHALLENGE);
+                    startActivityForResult(requestPin, REQUEST_PIN_CHALLENGE);
+                } else {
+                    Intent requestPin =
+                            new Intent("android.intent.action.RESTRICTIONS_PIN_CREATE");
+                    startActivityForResult(requestPin, REQUEST_PIN_CHALLENGE);
+                }
+                mChallengeRequested = true;
+            }
+        }
+        mChallengeSucceeded = false;
+    }
+
+    private void resetAndRemovePin() {
+        final UserManager um = UserManager.get(getActivity());
+        um.removeRestrictions();
+        clearSelectedApps();
+        finishFragment();
+    }
+
+    private void changePin() {
+        final UserManager um = UserManager.get(getActivity());
+        Intent requestPin = new Intent("android.intent.action.RESTRICTIONS_PIN_CREATE");
+        startActivityForResult(requestPin, REQUEST_PIN_CHALLENGE);
+    }
+
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_PIN_CHALLENGE) {
+            mChallengeRequested = false;
+            if (resultCode == Activity.RESULT_OK) {
+                getListView().setEnabled(true);
+                mChallengeSucceeded = true;
+            } else if (!isDetached()) {
+                finishFragment();
+            }
+            return;
+        }
+
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putBoolean(KEY_CHALLENGE_REQUESTED, mChallengeRequested);
+        if (getActivity().isChangingConfigurations()) {
+            outState.putBoolean(KEY_CHALLENGE_SUCCEEDED, mChallengeSucceeded);
+        }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (!mDisableSelf) {
+            menu.add(0, MENU_RESET, 0, R.string.restriction_menu_reset);
+            menu.add(0, MENU_CHANGE_PIN, 0, R.string.restriction_menu_change_pin);
+        }
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+        case MENU_RESET:
+            resetAndRemovePin();
+            return true;
+        case MENU_CHANGE_PIN:
+            changePin();
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index a19158f..c236b6d 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -374,10 +374,10 @@
         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 1d16bcf..946d871 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.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 5b732d6..d04c3cb 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -182,7 +182,7 @@
 
             if (display.equals(mWifiDisplayStatus.getActiveDisplay())) {
                 showDisconnectDialog(display);
-            } else {
+            } else if (display.canConnect()){
                 mDisplayManager.connectWifiDisplay(display.getDeviceAddress());
             }
         }
@@ -207,8 +207,7 @@
         preferenceScreen.removeAll();
 
         if (featureState == WifiDisplayStatus.FEATURE_STATE_ON) {
-            final WifiDisplay[] pairedDisplays = mWifiDisplayStatus.getRememberedDisplays();
-            final WifiDisplay[] availableDisplays = mWifiDisplayStatus.getAvailableDisplays();
+            final WifiDisplay[] displays = mWifiDisplayStatus.getDisplays();
 
             if (mPairedDevicesCategory == null) {
                 mPairedDevicesCategory = new PreferenceCategory(getActivity());
@@ -218,13 +217,6 @@
             }
             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 +226,16 @@
             }
             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 +250,7 @@
         getActivity().invalidateOptionsMenu();
     }
 
-    private Preference createWifiDisplayPreference(final WifiDisplay d, boolean paired) {
+    private Preference createWifiDisplayPreference(final WifiDisplay d) {
         WifiDisplayPreference p = new WifiDisplayPreference(getActivity(), d);
         if (d.equals(mWifiDisplayStatus.getActiveDisplay())) {
             switch (mWifiDisplayStatus.getActiveDisplayState()) {
@@ -264,11 +261,15 @@
                     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/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index 7ce3b8d..a6989f0 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -120,11 +120,10 @@
             mWifiManager.setWifiApEnabled(null, false);
         }
 
-        if (mWifiManager.setWifiEnabled(isChecked)) {
-            // Intent has been taken into account, disable until new state is active
-            mSwitch.setEnabled(false);
-        } else {
+        mSwitch.setEnabled(false);
+        if (!mWifiManager.setWifiEnabled(isChecked)) {
             // Error
+            mSwitch.setEnabled(true);
             Toast.makeText(mContext, R.string.wifi_error, Toast.LENGTH_SHORT).show();
         }
     }
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index 63ef549..cd1d721 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -83,6 +83,7 @@
     private OnClickListener mDeleteGroupListener;
     private WifiP2pPeer mSelectedWifiPeer;
     private WifiP2pPersistentGroup mSelectedGroup;
+    private String mSelectedGroupName;
     private EditText mDeviceNameText;
 
     private boolean mWifiP2pEnabled;
@@ -102,6 +103,7 @@
 
     private static final String SAVE_DIALOG_PEER = "PEER_STATE";
     private static final String SAVE_DEVICE_NAME = "DEV_NAME";
+    private static final String SAVE_SELECTED_GROUP = "GROUP_NAME";
 
     private WifiP2pDevice mThisDevice;
     private WifiP2pDeviceList mPeers = new WifiP2pDeviceList();
@@ -160,6 +162,10 @@
         }
     };
 
+    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 @@
         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 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 @@
             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 @@
         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 @@
 
         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 d988ebb..8ddac7d 100644
--- a/tests/res/values-ca/strings.xml
+++ b/tests/res/values-ca/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="3169265480789026010">"Detectable"</string>
+    <string name="discoverable" msgid="3169265480789026010">"Visible"</string>
     <string name="start_scan" msgid="6035699220942169744">"Inicia la cerca"</string>
     <string name="stop_scan" msgid="527546916633745779">"Atura la cerca"</string>
     <string name="operator_hello" msgid="292208161864910159">"Hola, Operador!"</string>