auto import from //branches/cupcake/...@130745

122 files changed, 5731 insertions, 4922 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9e39c9f..318e0b0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -30,13 +30,15 @@
     <uses-permission android:name="android.permission.ACCESS_CHECKIN_PROPERTIES"/>
     <uses-permission android:name="android.permission.READ_USER_DICTIONARY"/>
     <uses-permission android:name="android.permission.WRITE_USER_DICTIONARY"/>
+    <uses-permission android:name="android.permission.RESTART_PACKAGES"/>
+    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
+    <uses-permission android:name="android.permission.BATTERY_STATS"/>
 
     <application android:label="@string/settings_label" android:icon="@drawable/ic_launcher_settings">
 
         <!-- Settings -->
 
         <activity android:name="Settings" android:label="@string/settings_label"
-                android:theme="@android:style/Theme.NoTitleBar"
                 android:clearTaskOnLaunch="true"
                 android:launchMode="singleTop">
             <intent-filter>
@@ -51,7 +53,7 @@
 
         <activity android:name="WirelessSettings" 
                 android:label="@string/radio_controls_title"
-                android:theme="@android:style/Theme.NoTitleBar">
+                >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.WIRELESS_SETTINGS" />
@@ -65,7 +67,7 @@
         <!-- Top-level settings -->
 
         <activity android:name=".wifi.WifiSettings" android:label="@string/wifi_settings"
-                android:theme="@android:style/Theme.NoTitleBar">
+                >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.WIFI_SETTINGS" />
@@ -76,7 +78,7 @@
         </activity>
 
         <activity android:name=".wifi.AdvancedSettings" android:label="@string/wifi_ip_settings_titlebar"
-                android:theme="@android:style/Theme.NoTitleBar">
+                >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.WIFI_IP_SETTINGS" />
@@ -85,7 +87,7 @@
         </activity>
 
         <activity android:name="ApnSettings" android:label="@string/apn_settings"
-                android:theme="@android:style/Theme.NoTitleBar">
+                >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.APN_SETTINGS" />
@@ -96,7 +98,7 @@
 
         <activity android:name=".bluetooth.BluetoothSettings"
                   android:label="@string/bluetooth_settings_title"
-                  android:theme="@android:style/Theme.NoTitleBar">
+                  >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.BLUETOOTH_SETTINGS" />
@@ -105,7 +107,7 @@
         </activity>
 
         <activity android:name="DateTimeSettings" android:label="@string/date_and_time"
-                android:theme="@android:style/Theme.NoTitleBar">
+                >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.DATE_SETTINGS" />
@@ -136,7 +138,7 @@
         </activity>
 
         <activity android:name="LanguageSettings" android:label="@string/language_picker_title"
-                android:theme="@android:style/Theme.NoTitleBar">
+                >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -145,9 +147,10 @@
 
         <activity android:name="InputMethodsSettings" android:icon="@drawable/app_settings"
                 android:label="@string/input_methods_settings_title"
-                android:theme="@android:style/Theme.NoTitleBar">
+                >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.INPUT_METHOD_SETTINGS" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
         </activity>
@@ -156,12 +159,15 @@
                 android:label="@string/user_dict_settings_titlebar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.USER_DICTIONARY_SETTINGS" />
+                <action android:name="com.android.settings.USER_DICTIONARY_INSERT" />
+                <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
         </activity>
 
         <activity android:name="SoundAndDisplaySettings" android:label="@string/sound_and_display_settings"
-                android:theme="@android:style/Theme.NoTitleBar">
+                >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.settings.SOUND_SETTINGS" />
@@ -172,7 +178,7 @@
         </activity>
 
         <activity android:name="DeviceInfoSettings" android:label="@string/device_info_settings"
-                android:theme="@android:style/Theme.NoTitleBar">
+                >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -190,7 +196,7 @@
         </activity>
 
         <activity android:name="ApplicationSettings" android:label="@string/applications_settings_header"
-                android:theme="@android:style/Theme.NoTitleBar">
+                >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.APPLICATION_SETTINGS" />
@@ -218,8 +224,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="SecuritySettings" android:label="@string/lockpattern_settings_title"
-                android:theme="@android:style/Theme.NoTitleBar">
+        <activity android:name="SecuritySettings" android:label="@string/security_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.SECURITY_SETTINGS" />
@@ -230,8 +235,7 @@
         </activity>
 
         <activity android:name="SimLockSettings" android:label="@string/sim_lock_settings"
-                android:process="com.android.phone"
-                android:theme="@android:style/Theme.NoTitleBar">
+                android:process="com.android.phone">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -254,15 +258,14 @@
 
         <activity android:name="ChooseLockPatternTutorial" 
             android:label="@string/lockpattern_change_lock_pattern_label"
-            android:theme="@android:style/Theme.NoTitleBar">
+            >
             <intent-filter>
                 <action android:name="android.intent.action.DEFAULT" />
             </intent-filter>
         </activity>
         
         <activity android:name="ChooseLockPatternExample" 
-            android:label="@string/lockpattern_change_lock_pattern_label"
-            android:theme="@android:style/Theme.NoTitleBar">
+            android:label="@string/lockpattern_change_lock_pattern_label">
             <intent-filter>
                 <action android:name="android.intent.action.DEFAULT" />
             </intent-filter>
@@ -271,8 +274,7 @@
         <activity android:name="ZoneList" android:label="@string/choose_timezone" />
 
         <activity android:name=".deviceinfo.Status" android:label="@string/device_status_activity_title"
-                android:process="com.android.phone"
-                android:theme="@android:style/Theme.NoTitleBar">
+                android:process="com.android.phone">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -280,8 +282,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".deviceinfo.Memory" android:label="@string/storage_settings_title"
-                android:theme="@android:style/Theme.NoTitleBar">
+        <activity android:name=".deviceinfo.Memory" android:label="@string/storage_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.INTERNAL_STORAGE_SETTINGS" />
@@ -312,8 +313,14 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".quicklaunch.QuickLaunchSettings" android:label="@string/quick_launch_title"
-                android:theme="@android:style/Theme.NoTitleBar">
+        <activity android:name="MediaFormat" android:label="@string/media_format_title">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".quicklaunch.QuickLaunchSettings" 
+                android:label="@string/quick_launch_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.settings.QUICK_LAUNCH_SETTINGS" />
@@ -329,8 +336,7 @@
         </activity>
 
         <activity android:name="DevelopmentSettings" android:icon="@drawable/app_settings"
-                android:label="@string/development_settings_title"
-                android:theme="@android:style/Theme.NoTitleBar">
+                android:label="@string/development_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
@@ -340,19 +346,6 @@
 
 
 
-        <!-- System-triggered settings -->
-
-        <receiver android:name="SdCardErrorReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.MEDIA_BAD_REMOVAL" />
-                <data android:scheme="file" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MEDIA_UNMOUNTABLE" />
-                <data android:scheme="file" />
-            </intent-filter>
-        </receiver>
-
         <!-- Bluetooth stuff -->
 
         <activity android:name=".bluetooth.ConnectSpecificProfilesActivity"
@@ -417,7 +410,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="BatteryHistory" android:label="@string/battery_history_label">
+        <activity android:name=".battery_history.BatteryHistory" android:label="@string/battery_history_label">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -468,8 +461,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="TestingSettings" android:label="@string/testing"
-                android:theme="@android:style/Theme.NoTitleBar">>
+        <activity android:name="TestingSettings" android:label="@string/testing">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -483,6 +475,21 @@
             </intent-filter>
        </receiver>
 
+        <!-- Standard picker for gadgets -->
+
+        <activity android:name="GadgetPickActivity" android:label="@string/gadget_picker_title">
+            <intent-filter>
+                <action android:name="android.gadget.action.PICK_GADGET" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="UsageStats" android:label="@string/usage_stats_label">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
+            </intent-filter>
+        </activity>
 
     </application>
 
diff --git a/res/layout/app_launcher.xml b/res/layout/app_launcher.xml
deleted file mode 100644
index 04d3fce..0000000
--- a/res/layout/app_launcher.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Settings/res/layout/app_launcher.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/info_layout">        
-    <LinearLayout style="@style/entry_layout"
-        android:orientation="vertical">
-
-        <CheckBox android:id="@+id/newView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/app_launcher_newView_text" />
-
-    </LinearLayout>
-</LinearLayout>
diff --git a/res/layout/battery_history.xml b/res/layout/battery_history.xml
index c8c2097..5421c40 100644
--- a/res/layout/battery_history.xml
+++ b/res/layout/battery_history.xml
@@ -1,14 +1,144 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/topLayout"
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
-    <ScrollView
+
+    <TextView
+        android:id="@+id/title"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content" />
+
+    <LinearLayout
+        android:id="@+id/graphLayout"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" >
+
+        <Spinner
+            android:id="@+id/typeSpinner"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:entries="@array/battery_history_type_spinner" />
+
+        <Spinner
+            android:id="@+id/whichSpinner"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:entries="@array/battery_history_which_spinner" />
+
+        <ScrollView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content" >
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content" >
+            
         <TextView
-            android:id="@+id/text"
+            android:id="@+id/messageText"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:textSize="17dp"
+            android:visibility="gone" />
+
+        <com.android.settings.battery_history.GraphableButton
+            android:id="@+id/button0"
+            android:layout_width="fill_parent"
+            android:layout_height="0dp"
+            android:layout_marginLeft="4dp"
+            android:layout_marginRight="4dp"
+            android:layout_marginBottom="4dp"
+            android:layout_weight="1" />
+    
+        <com.android.settings.battery_history.GraphableButton
+            android:id="@+id/button1"
+            android:layout_width="fill_parent"
+            android:layout_height="0dp"
+            android:layout_marginLeft="4dp"
+            android:layout_marginRight="4dp"
+            android:layout_marginBottom="4dp"
+            android:layout_weight="1" />
+    
+        <com.android.settings.battery_history.GraphableButton
+            android:id="@+id/button2"
+            android:layout_width="fill_parent"
+            android:layout_height="0dp"
+            android:layout_marginLeft="4dp"
+            android:layout_marginRight="4dp"
+            android:layout_marginBottom="4dp"
+            android:layout_weight="1" />
+    
+        <com.android.settings.battery_history.GraphableButton
+            android:id="@+id/button3"
+            android:layout_width="fill_parent"
+            android:layout_height="0dp"
+            android:layout_marginLeft="4dp"
+            android:layout_marginRight="4dp"
+            android:layout_marginBottom="4dp"
+            android:layout_weight="1" />
+    
+        <com.android.settings.battery_history.GraphableButton
+            android:id="@+id/button4"
+            android:layout_width="fill_parent"
+            android:layout_height="0dp"
+            android:layout_marginLeft="4dp"
+            android:layout_marginRight="4dp"
+            android:layout_marginBottom="4dp"
+            android:layout_weight="1" />
+    
+        <com.android.settings.battery_history.GraphableButton
+            android:id="@+id/button5"
+            android:layout_width="fill_parent"
+            android:layout_height="0dp"
+            android:layout_marginLeft="4dp"
+            android:layout_marginRight="4dp"
+            android:layout_marginBottom="4dp"
+            android:layout_weight="1" />
+    
+        <com.android.settings.battery_history.GraphableButton
+            android:id="@+id/button6"
+            android:layout_width="fill_parent"
+            android:layout_height="0dp"
+            android:layout_marginLeft="4dp"
+            android:layout_marginRight="4dp"
+            android:layout_marginBottom="4dp"
+            android:layout_weight="1" />
+    
+        <com.android.settings.battery_history.GraphableButton
+            android:id="@+id/button7"
+            android:layout_width="fill_parent"
+            android:layout_height="0dp"
+            android:layout_marginLeft="4dp"
+            android:layout_marginRight="4dp"
+            android:layout_marginBottom="4dp"
+            android:layout_weight="1" />
+
+        </LinearLayout>
+        </ScrollView>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/textLayout"
+        android:visibility="gone"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" >
+
+        <ScrollView
             android:layout_width="fill_parent"
-            android:layout_height="1000dp"/>
-    </ScrollView>
+            android:layout_height="fill_parent" >
+            <TextView
+                android:id="@+id/detailsText"
+                android:layout_width="fill_parent"
+                android:textSize="17dp"
+                android:layout_height="1000dp"/>
+        </ScrollView>
+
+    </LinearLayout>
+
 </LinearLayout>
diff --git a/res/layout/bluetooth_data_entry.xml b/res/layout/bluetooth_data_entry.xml
deleted file mode 100644
index 1900b6e..0000000
--- a/res/layout/bluetooth_data_entry.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Settings/assets/res/layout/bluetooth_pairing_panel.xml
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <TextView android:id="@+id/dataLabel"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" 
-        android:text="@string/bluetooth_new_data" />
-
-    <EditText android:id="@+id/dataEntry"
-        android:layout_marginTop="2dip"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:scrollHorizontally="true"
-        android:autoText="false"
-        android:capitalize="none"
-        android:singleLine="true"
-        android:password="true"
-        android:maxLines="1" />
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-
-        <Button android:id="@+id/confirmButton"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            android:text="@string/bluetooth_new_data_confirm" />
-
-        <Button android:id="@+id/cancelButton"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            android:text="@string/bluetooth_new_data_cancel" />
-            
-    </LinearLayout>
-</LinearLayout>        
-
diff --git a/res/layout/bluetooth_device_list_item.xml b/res/layout/bluetooth_device_list_item.xml
deleted file mode 100644
index 3b80261..0000000
--- a/res/layout/bluetooth_device_list_item.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Settings/assets/res/any/layout/bluetooth_device_list_item.xml
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="3dip"
-    android:paddingLeft="6dip"
-    android:paddingRight="6dip">
-
-    <ImageView android:id="@+id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@android:drawable/sym_contact_card"/>
-
-    <TextView android:id="@+id/name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="6dip"
-        android:layout_toRightOf="@id/icon"
-        android:textColor="#FFFFFFFF"
-        android:textSize="18sp"
-        android:textStyle="bold"/>
-
-</RelativeLayout>
diff --git a/res/layout/bluetooth_discoverability_panel.xml b/res/layout/bluetooth_discoverability_panel.xml
deleted file mode 100644
index ca50aa8..0000000
--- a/res/layout/bluetooth_discoverability_panel.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Settings/assets/res/layout/bluetooth_pairing_panel.xml
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="2dip"
-    android:paddingRight="2dip">
-
-    <LinearLayout
-    	android:text="@string/bluetooth_discoverability_panel_title"
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="20dip"
-        android:paddingRight="20dip">
-
-        <Button android:id="@+id/discoverable"
-            android:visibility="visible"
-            android:text="@string/bluetooth_discoverable"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"/>
-
-        <Button android:id="@+id/connectable"
-            android:visibility="visible"
-            android:text="@string/bluetooth_connectable"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"/>
-
-        <Button android:id="@+id/neither"
-            android:visibility="visible"
-            android:text="@string/bluetooth_neither"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"/>
-
-    </LinearLayout>
-</FrameLayout>
diff --git a/res/layout/bluetooth_discovery_screen.xml b/res/layout/bluetooth_discovery_screen.xml
deleted file mode 100644
index d3a7f79..0000000
--- a/res/layout/bluetooth_discovery_screen.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Settings/res/layout/bluetooth_discovery_screen.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:paddingLeft="2dip"
-    android:paddingRight="2dip">
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:paddingLeft="3dip"
-        android:paddingRight="3dip">
-
-        <TextView android:id="@+id/label"
-            android:textStyle="bold"
-            android:text="@string/bluetooth_scan_for_new_devices"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"/>
-
-        <ListView android:id="@android:id/list"
-            android:layout_marginTop="5dip"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:drawSelectorOnTop="false">
-        </ListView>
-    </LinearLayout>
-</FrameLayout>
diff --git a/res/layout/bluetooth_pairing_panel.xml b/res/layout/bluetooth_pairing_panel.xml
deleted file mode 100644
index 550bd38..0000000
--- a/res/layout/bluetooth_pairing_panel.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Settings/assets/res/layout/bluetooth_pairing_panel.xml
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="2dip"
-    android:paddingRight="2dip">
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="20dip"
-        android:paddingRight="20dip">
-
-        <TextView android:id="@+id/status"
-            android:visibility="visible"
-            android:text="@string/bluetooth_pairing_msg"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"/>
-    </LinearLayout>
-</FrameLayout>
diff --git a/res/layout/bluetooth_pin_entry.xml b/res/layout/bluetooth_pin_entry.xml
index 6739f84..bcb6f16 100644
--- a/res/layout/bluetooth_pin_entry.xml
+++ b/res/layout/bluetooth_pin_entry.xml
@@ -32,6 +32,8 @@
             android:id="@+id/message"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
             android:gravity="center_horizontal"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
diff --git a/res/layout/bluetooth_sdp_query.xml b/res/layout/bluetooth_sdp_query.xml
deleted file mode 100644
index 907de72..0000000
--- a/res/layout/bluetooth_sdp_query.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/scroll_content" android:layout_width="fill_parent" android:layout_height="fill_parent">
-   <LinearLayout
-       android:orientation="vertical"
-       android:layout_width="fill_parent"
-       android:layout_height="fill_parent">
-
-       <TextView android:id="@+id/services"
-           android:layout_width="fill_parent"
-           android:layout_height="wrap_content" 
-           android:text="@string/bluetooth_sdp_query_services_text" />
-    </LinearLayout>        
-</ScrollView>        
-
diff --git a/res/layout/choose_lock_pattern.xml b/res/layout/choose_lock_pattern.xml
index 67a5257..110b9ad 100644
--- a/res/layout/choose_lock_pattern.xml
+++ b/res/layout/choose_lock_pattern.xml
@@ -24,7 +24,7 @@
     <TextView android:id="@+id/headerText"
         android:layout_width="fill_parent"
         android:layout_height="0dip"
-        android:layout_weight="1.0"
+        android:layout_weight="1"
         android:gravity="center"
         android:textSize="18sp"/>
 
@@ -40,39 +40,42 @@
          android:layout_width="fill_parent"
          android:layout_height="8dip" />
 
-    <!-- footer can show a message, or confirm / restart buttons -->
-    <RelativeLayout
-            android:layout_width="fill_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1.0">
+    <!-- message just above the button bar -->
+    <TextView android:id="@+id/footerText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:textSize="14sp"/>
 
-        <!-- message -->
-        <TextView android:id="@+id/footerText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_centerHorizontal="true"
-            android:textSize="14sp"/>
+    <!-- confirm / restart buttons -->
+    <LinearLayout style="@android:style/ButtonBar"
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
 
         <!-- left button: skip, or retry -->
         <Button android:id="@+id/footerLeftButton"
-            android:layout_width="150dip"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentBottom="true"
+            android:layout_width="0dip"
+            android:layout_weight="1"
             android:text="@string/lockpattern_restart_button_text"/>
 
+        <!-- Placeholder to get blank space between the two buttons -->
+        <View
+            android:visibility="invisible"
+            android:layout_height="0dip"
+            android:layout_width="1dip"
+            android:layout_weight="1" />
+
         <!-- right button: confirm or ok -->
         <Button android:id="@+id/footerRightButton"
-            android:layout_width="150dip"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentBottom="true"
+            android:layout_width="0dip"
+            android:layout_weight="1"
             android:drawableRight="@drawable/ic_btn_next"
             android:drawablePadding="3dip"
             android:text="@string/lockpattern_confirm_button_text"/>
 
-    </RelativeLayout>
+    </LinearLayout>
 
 </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
-
diff --git a/res/layout/choose_lock_pattern_example.xml b/res/layout/choose_lock_pattern_example.xml
index 0a58f17..b2d32e6 100644
--- a/res/layout/choose_lock_pattern_example.xml
+++ b/res/layout/choose_lock_pattern_example.xml
@@ -35,7 +35,6 @@
                 android:layout_height="wrap_content"
                 android:text="@string/lock_example_title"
                 android:gravity="center_horizontal"
-                android:layout_marginTop="5dip"
                 style="?android:attr/textAppearanceLarge"
             />
         
@@ -61,28 +60,34 @@
 
     </ScrollView>
     
-    <RelativeLayout
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent">
+    <LinearLayout style="@android:style/ButtonBar"
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
         
         <Button android:id="@+id/skip_button"
-            android:layout_width="150dip"
             android:layout_height="wrap_content"
-            android:layout_margin="5dip"
-            android:layout_alignParentLeft="true"
+            android:layout_width="0dip"
+            android:layout_weight="1"
             android:text="@string/skip_button_label"
         />
       
+        <View
+            android:visibility="invisible"
+            android:layout_height="0dip"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+        />
+
         <Button android:id="@+id/next_button"
-            android:layout_width="150dip"
             android:layout_height="wrap_content"
-            android:layout_margin="5dip"
+            android:layout_width="0dip"
+            android:layout_weight="1"
             android:drawableRight="@drawable/ic_btn_next"
             android:drawablePadding="3dip"
-            android:layout_alignParentRight="true"
             android:text="@string/next_button_label"
         />
         
-    </RelativeLayout>
+    </LinearLayout>
     
-</LinearLayout >
+</LinearLayout>
diff --git a/res/layout/choose_lock_pattern_tutorial.xml b/res/layout/choose_lock_pattern_tutorial.xml
index 1c3e90b..47af50b 100644
--- a/res/layout/choose_lock_pattern_tutorial.xml
+++ b/res/layout/choose_lock_pattern_tutorial.xml
@@ -52,30 +52,34 @@
        
     </ScrollView>
     
-    <RelativeLayout
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent">
-        
+    <LinearLayout style="@android:style/ButtonBar"
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+
         <Button android:id="@+id/skip_button"
-            android:layout_width="150dip"
             android:layout_height="wrap_content"
+            android:layout_width="0dip"
             android:layout_weight="1"
-            android:layout_margin="5dip"
-            android:layout_alignParentLeft="true"
             android:text="@string/skip_button_label"
         />
         
+        <View
+            android:visibility="invisible"
+            android:layout_height="0dip"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+        />
+
         <Button android:id="@+id/next_button"
-            android:layout_width="150dip"
             android:layout_height="wrap_content"
+            android:layout_width="0dip"
             android:layout_weight="1"
-            android:layout_margin="5dip"
-            android:layout_alignParentRight="true"
             android:drawableRight="@drawable/ic_btn_next"
             android:drawablePadding="3dip"
             android:text="@string/next_button_label"
         />
         
-    </RelativeLayout>
+    </LinearLayout>
     
 </LinearLayout >
diff --git a/res/layout/date_picker_activity.xml b/res/layout/date_picker_activity.xml
deleted file mode 100644
index 16a4a69..0000000
--- a/res/layout/date_picker_activity.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <DatePicker
-        android:id="@+id/datePicker"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true" />
-        
-</RelativeLayout>
diff --git a/res/layout/date_time.xml b/res/layout/date_time.xml
deleted file mode 100644
index fc7e942..0000000
--- a/res/layout/date_time.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Settings/assets/res/any/layout/date_time.xml
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              style="@style/info_layout">        
-
-    <!-- time picker -->
-    <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-        <TextView android:id="@+id/timeDisplay"
-                android:maxLines="1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/date_time_timeDisplay_text"/>
-        <Button android:id="@+id/changeTime"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/date_time_changeTime_text"/>
-    </LinearLayout>
-
-
-    <!-- date picker -->
-    <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-        <TextView android:id="@+id/dateDisplay"
-                android:maxLines="1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/date_time_dateDisplay_text"/>
-        <Button android:id="@+id/changeDate"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/date_time_changeDate_text"/>
-    </LinearLayout>
-
-    <!-- Time Zone -->
-    <LinearLayout style="@style/entry_layout">
-        <TextView android:text="@string/date_time_timezone_label" style="@style/info_label" />
-        <TextView android:id="@+id/zone" style="@style/info_value" />
-    </LinearLayout>
-
-    <Button android:id="@+id/setzone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/date_time_setzone_text" />
-</LinearLayout>
-    
diff --git a/res/layout/device_info_screen.xml b/res/layout/device_info_screen.xml
deleted file mode 100644
index 7f4af31..0000000
--- a/res/layout/device_info_screen.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Settings/res/layout/device_info_screen.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:paddingLeft="6dip"
-    android:paddingRight="6dip"
-    android:paddingBottom="3dip"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <requestFocus/>
-
-    <LinearLayout android:id="@+id/list"
-        android:orientation="vertical"
-        android:paddingLeft="10dip"
-        android:paddingTop="10dip"
-        android:paddingRight="10dip"
-        android:paddingBottom="10dip"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-
-        <!-- Note: Property values are inserted above these controls. -->
-
-        <TextView android:id="@+id/target_build_label"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:text="@string/target_build_field_label" />
-
-        <EditText android:id="@+id/target_build_field"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:paddingLeft="3dip"
-            android:paddingBottom="6dip" />
-
-        <Button android:id="@+id/checkin_button"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/checkin_button_label" />
-
-    </LinearLayout>
-</ScrollView>
diff --git a/res/layout/info_screen.xml b/res/layout/info_screen.xml
deleted file mode 100644
index adb9ca5..0000000
--- a/res/layout/info_screen.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Settings/res/layout/device_info_screen.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <requestFocus/>
-
-    <LinearLayout android:id="@+id/list"
-        android:orientation="vertical"
-        android:paddingLeft="10dip"
-        android:paddingTop="5dip"
-        android:paddingRight="10dip"
-        android:paddingBottom="5dip"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-    </LinearLayout>
-</ScrollView>
-    
diff --git a/res/layout/info_screen_item.xml b/res/layout/info_screen_item.xml
deleted file mode 100644
index 1f71016..0000000
--- a/res/layout/info_screen_item.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!--  List item layout for a setting -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingBottom="10dip"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/info_name_text"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textColor="@color/white"
-        android:textStyle="bold" />
-
-    <TextView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/info_value_text"
-        android:paddingLeft="20dip"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textColor="@color/lighter_gray" />
-
-</LinearLayout>
diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml
index 6ca92d2..4c06f99 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -24,41 +24,13 @@
         android:id="@+id/all_details"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
+        android:paddingRight="6dip"
+        android:paddingTop="5dip"
+        android:paddingBottom="5dip"
         android:orientation="vertical">
-        <RelativeLayout 
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical">
-            <TextView android:id="@+id/app_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="?android:attr/textColorPrimary"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentLeft="true"
-                android:paddingTop="6dip"
-                android:paddingRight="6dip" 
-                android:paddingLeft="6dip" />
-
-            <TextView android:id="@+id/app_description"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_below="@id/app_name"
-                android:layout_alignParentLeft="true"
-                android:paddingTop="6dip" 
-                android:paddingBottom="6dip" 
-                android:paddingRight="6dip" 
-                android:paddingLeft="6dip" />
-            <ImageView android:id="@+id/app_icon"
-                android:layout_width="@android:dimen/app_icon_size"
-                android:layout_height="@android:dimen/app_icon_size"
-                android:layout_alignParentRight="true"
-                android:paddingTop="6dip" 
-                android:paddingBottom="6dip" 
-                android:paddingRight="6dip"
-                android:scaleType="fitCenter" />
-        </RelativeLayout>
+        <include
+            layout="@layout/manage_applications_item"
+            android:id="@+id/app_snippet"/>
 
         <TextView
             style="?android:attr/listSeparatorTextViewStyle"
@@ -316,6 +288,24 @@
                 android:layout_height="fill_parent"
                 android:orientation="vertical"/>
         </LinearLayout>
+
+        <!-- Prefered activities section -->
+        <TextView
+            style="?android:attr/listSeparatorTextViewStyle"
+            android:text="@string/controls_label" />
+
+        <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical">
+            <Button android:id="@+id/force_stop_button"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentTop="true"
+                android:layout_centerHorizontal="true"
+                android:layout_width="150dip"
+                android:text="@string/force_stop"
+                android:layout_height="wrap_content" />
+        </RelativeLayout>
     </LinearLayout>
 </ScrollView>
 
diff --git a/res/layout/keyguard.xml b/res/layout/keyguard.xml
deleted file mode 100644
index 64a48de..0000000
--- a/res/layout/keyguard.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Settings/res/layout/keyguard.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/info_layout">        
-    <!-- Keyboard Version -->
-    <LinearLayout style="@style/entry_layout"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/keyguard_label" />
-
-        <Spinner android:id="@+id/kg_options"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dip">
-        </Spinner>
-
-        <Button android:id="@+id/pw_mod"
-            android:layout_width="150dip"
-            android:layout_height="wrap_content"
-            android:text="@string/keyguard_pw_mod_text"
-            android:gravity="center_horizontal" />
-
-    </LinearLayout>
-
-    <LinearLayout style="@style/entry_layout"
-        android:orientation="vertical"
-        android:layout_marginTop="20dip"
-            >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/keyguard_sim_pin_label" />
-
-        <Button android:id="@+id/pin_enable"
-            android:layout_width="150dip"
-            android:layout_height="wrap_content" 
-            android:gravity="center_horizontal" />
-
-        <Button android:id="@+id/pin_mod"
-            android:layout_width="150dip"
-            android:layout_height="wrap_content"
-            android:text="@string/keyguard_pin_mod_text"
-            android:gravity="center_horizontal" />
-
-    </LinearLayout>
-</LinearLayout>
diff --git a/res/layout/keyguard_password.xml b/res/layout/keyguard_password.xml
deleted file mode 100644
index 7bf3b15..0000000
--- a/res/layout/keyguard_password.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Settings/res/layout/keyguard_password.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        >
-
-    <LinearLayout
-            style="@style/info_layout"
-            android:orientation="vertical">
-
-        <TextView
-            style="@style/info_label"
-            android:text="@string/keyguard_password_old_label"
-            />
-
-        <EditText android:id="@+id/old_password"
-            android:singleLine="true"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:scrollHorizontally="true"
-            android:autoText="false"
-            android:capitalize="none"
-            android:password="true" 
-            android:maxLength="32"
-            />
-
-        <TextView android:id="@+id/old_password_error"
-            style="@style/info_label"
-            android:visibility="gone"
-            android:text="@string/keyguard_password_old_password_error_text"
-            />
-
-
-        <TextView
-            style="@style/info_label"
-            android:text="@string/keyguard_password_new_label"
-            />
-
-        <EditText android:id="@+id/new_password_1"
-            android:singleLine="true"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:scrollHorizontally="true"
-            android:autoText="false"
-            android:capitalize="none"
-            android:password="true" 
-            android:maxLength="32"
-            />
-
-
-        <TextView
-            style="@style/info_label"
-            android:text="@string/keyguard_password_confirm_new_label"
-            />
-
-        <EditText android:id="@+id/new_password_2"
-            android:singleLine="true"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:scrollHorizontally="true"
-            android:autoText="false"
-            android:capitalize="none"
-            android:password="true" 
-            android:maxLength="32"
-            />
-
-
-        <TextView android:id="@+id/mismatch_error"
-            style="@style/info_label"
-            android:visibility="gone"
-            android:text="@string/keyguard_password_mismatch_error_text"
-            />
-
-
-        <Button android:id="@+id/button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/keyguard_password_button_text"
-            />
-    </LinearLayout>
-
-</ScrollView>
-
diff --git a/res/layout/manage_applications_item.xml b/res/layout/manage_applications_item.xml
index 78addc9..ecefcf5 100755
--- a/res/layout/manage_applications_item.xml
+++ b/res/layout/manage_applications_item.xml
@@ -17,39 +17,43 @@
 */
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:layout_gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight">
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="horizontal"
+    android:paddingRight="6dip"
+    android:paddingLeft="6dip"
+    android:paddingTop="5dip"
+    android:paddingBottom="5dip"
+    android:gravity="center_vertical" >
 
     <ImageView android:id="@+id/app_icon"
         android:layout_width="@android:dimen/app_icon_size"
         android:layout_height="@android:dimen/app_icon_size"
-        android:layout_alignParentLeft="true"
-        android:layout_marginTop="6dip"
-        android:layout_marginBottom="6dip"
-        android:background="@drawable/border_item_thumbnail" />
+        android:layout_marginLeft="5dip"
+        android:layout_marginRight="11dip"
+        android:layout_gravity="center_vertical"
+        android:scaleType="fitCenter"/>
 
-    <TextView android:id="@+id/app_size"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:layout_alignParentRight="true"
-        android:paddingRight="6dip"
-        android:paddingLeft="12dip"
-        android:paddingTop="16dip"
-        android:maxLines="1" />
-
-    <TextView android:id="@+id/app_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textColor="?android:attr/textColorPrimary"
-        android:layout_toRightOf="@id/app_icon"
-        android:layout_toLeftOf="@id/app_size"
-        android:layout_alignTop="@id/app_icon"
-        android:paddingLeft="2dip"
-        android:paddingTop="6dip"/>
-</RelativeLayout>
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+        <TextView android:id="@+id/app_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textStyle="bold"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:layout_marginBottom="2dip" />
+        <TextView android:id="@+id/app_size"
+            android:layout_marginTop="-4dip"
+            android:layout_gravity="center_vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+    </LinearLayout>
+</LinearLayout>
 
diff --git a/res/layout/media_format_final.xml b/res/layout/media_format_final.xml
new file mode 100644
index 0000000..ab18f34
--- /dev/null
+++ b/res/layout/media_format_final.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright (C) 2008 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        style="@style/info_layout">        
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="20sp"
+        android:text="@string/media_format_final_desc" />
+
+    <Button android:id="@+id/execute_media_format"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="40dip"
+        android:layout_width="150dip"
+        android:layout_height="wrap_content"
+        android:text="@string/media_format_final_button_text"
+        android:gravity="center" />
+        
+</LinearLayout>
diff --git a/res/layout/media_format_primary.xml b/res/layout/media_format_primary.xml
new file mode 100644
index 0000000..3590492
--- /dev/null
+++ b/res/layout/media_format_primary.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright (C) 2008 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing, software 
+** distributed under the License is distributed on an "AS IS" BASIS, 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+-->
+
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        style="@style/info_layout">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="18sp"
+        android:text="@string/media_format_desc" />
+
+    <Button android:id="@+id/initiate_media_format"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="40dip"
+        android:layout_width="150dip"
+        android:layout_height="wrap_content"
+        android:text="@string/media_format_button_text"
+        android:gravity="center" />
+        
+</LinearLayout>
diff --git a/res/layout/mylocation.xml b/res/layout/mylocation.xml
deleted file mode 100644
index 97a7b0e..0000000
--- a/res/layout/mylocation.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Settings/res/layout/keyguard.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/info_layout">        
-    <LinearLayout style="@style/entry_layout"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/location_label" />
-
-        <Spinner android:id="@+id/provider_spinner"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dip">
-        </Spinner>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/location_status" />
-
-        <Spinner android:id="@+id/enabled_spinner"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dip">
-        </Spinner>
-    </LinearLayout>
-</LinearLayout>
diff --git a/res/layout/power_management.xml b/res/layout/power_management.xml
deleted file mode 100644
index e450404..0000000
--- a/res/layout/power_management.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* 
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/info_layout">        
-    <!-- Keyboard Version -->
-    <LinearLayout style="@style/entry_layout" android:orientation="vertical">
-        
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/screen_off_timeout_label">
-        </TextView>
-
-        <Spinner android:id="@+id/screen_off_timeout"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dip">
-        </Spinner>
-
-        <!-- Stay on while plugged in -->
-        <CheckBox android:id="@+id/dim_screen"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" 
-            android:text="@string/dim_screen">
-        </CheckBox>
-        
-        <!-- Stay on while plugged in -->
-        <CheckBox android:id="@+id/stay_on"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" 
-            android:text="@string/stay_on">
-        </CheckBox>
-        
-    </LinearLayout>
-</LinearLayout>
diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml
index f2f2c9d..6528e54 100644
--- a/res/layout/preference_progress_category.xml
+++ b/res/layout/preference_progress_category.xml
@@ -16,13 +16,18 @@
 
 <!-- Layout used for ProgressCategory in bluetooth settings. -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"      
-    android:layout_width="fill_parent"
-    android:layout_height="27dip"
-    android:background="@*android:drawable/settings_header">
+    style="?android:attr/listSeparatorTextViewStyle">
 
+    <!-- This and the other text view have the style of the list separator text view without the background and padding -->
     <TextView 
-        android:id="@+android:id/title"
         style="?android:attr/listSeparatorTextViewStyle"
+        android:background="@null"
+        android:paddingLeft="0dip"
+        android:id="@+android:id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
     />
         
     <ProgressBar
@@ -37,13 +42,14 @@
         />
         
     <TextView 
+        style="?android:attr/listSeparatorTextViewStyle"
+        android:background="@null"
+        android:paddingLeft="0dip"
         android:id="@+id/scanning_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_toLeftOf="@id/scanning_progress"
-        android:textSize="18sp"
-        android:textColor="@android:color/primary_text_light"
         android:layout_marginRight="5sp"
         android:text="@string/progress_scanning"
         />
diff --git a/res/layout/preference_widget_btdevice_status.xml b/res/layout/preference_widget_btdevice_status.xml
deleted file mode 100644
index 9882ed9..0000000
--- a/res/layout/preference_widget_btdevice_status.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-    
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android" 
-            android:id="@+id/device_headset" 
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="4sp"
-            android:layout_gravity="center_vertical"
-            android:visibility="gone"
-            android:src="@android:drawable/stat_sys_headset" />
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index 1b20373..e8eba5a 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -255,5 +255,17 @@
                       android:layout_toRightOf="@id/smsc_label" />
         </RelativeLayout>
 
+        <!-- Test setting to ignore bad DNS, useful in lab environments -->
+        <LinearLayout style="@style/entry_layout">
+            <Button android:id="@+id/dns_check_toggle"
+                    android:textSize="14sp"
+                    android:layout_marginTop="8dip"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/radio_info_toggle_dns_check_label"
+                    />
+            <TextView android:id="@+id/dnsCheckState" style="@style/info_value" />
+        </LinearLayout>
+
     </LinearLayout>
 </ScrollView>
diff --git a/res/layout/ringer_volume_screen.xml b/res/layout/ringer_volume_screen.xml
deleted file mode 100644
index aa06fa4..0000000
--- a/res/layout/ringer_volume_screen.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Settings/res/layout/ringer_volume_screen.xml
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:scrollbars="none">
-
-    <LinearLayout
-        android:id="@+id/list"
-        android:orientation="vertical"
-        android:paddingLeft="10dip"
-        android:paddingTop="10dip"
-        android:paddingRight="10dip"
-        android:paddingBottom="10dip"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/ringer_volume_instructions" />
-
-        <LinearLayout
-            style="@style/entry_layout"
-            android:orientation="vertical"
-            android:layout_marginTop="20dip">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/ringer_volume_ringer_mode_label" />
-
-            <Spinner
-                android:id="@+id/ringer_mode"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content">
-                <requestFocus />
-            </Spinner>
-
-        </LinearLayout>
-
-        <LinearLayout
-            style="@style/entry_layout"
-            android:orientation="vertical"
-            android:layout_marginTop="20dip">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/ringer_volume_ringtone_label" />
-
-            <Spinner
-                android:id="@+id/file"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content">
-            </Spinner>
-
-        </LinearLayout>
-
-        <LinearLayout
-            style="@style/entry_layout"
-            android:orientation="vertical"
-            android:layout_marginTop="20dip">
-
-            <CheckBox
-                android:id="@+id/increasing"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/ringer_volume_screen_increasing_text" />
-
-
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</ScrollView>
diff --git a/res/layout/sdcard_settings_screen.xml b/res/layout/sdcard_settings_screen.xml
index 52ef2fc..734a5b6 100644
--- a/res/layout/sdcard_settings_screen.xml
+++ b/res/layout/sdcard_settings_screen.xml
@@ -64,6 +64,12 @@
                 android:textSize="14sp"
                 android:layout_marginTop="8dip"
                 android:layout_width="wrap_content" android:layout_height="wrap_content" />
+
+            <Button android:id="@+id/sdcard_format"
+                android:text="@string/sdcard_format" 
+                android:textSize="14sp"
+                android:layout_marginTop="8dip"
+                android:layout_width="wrap_content" android:layout_height="wrap_content" />
     
             <TableLayout
                 android:layout_width="fill_parent"
diff --git a/res/layout/settings_chooser.xml b/res/layout/settings_chooser.xml
deleted file mode 100644
index ad79485..0000000
--- a/res/layout/settings_chooser.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!--  TODO: Remove file 881807 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:text="@string/settings_chooser_pick_string"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textColor="@color/white"
-        android:textStyle="bold" />
-
-    <Spinner
-        android:id="@+id/settings_app_spinner"
-        android:layout_marginLeft="20dip"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/res/layout/systemsettings.xml b/res/layout/systemsettings.xml
deleted file mode 100644
index 54bf896..0000000
--- a/res/layout/systemsettings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!--  Layout for system settings that require an expandable list -->
-<ExpandableListView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/system_settings"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
-</ExpandableListView>
diff --git a/res/layout/systemsettings_flat.xml b/res/layout/systemsettings_flat.xml
deleted file mode 100644
index 0d0126b..0000000
--- a/res/layout/systemsettings_flat.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!--  Layout for system settings that require a flat list -->
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/system_settings"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
-</ListView>
diff --git a/res/layout/telephony_editor.xml b/res/layout/telephony_editor.xml
deleted file mode 100644
index 1721478..0000000
--- a/res/layout/telephony_editor.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Settings/assets/res/any/layout/radio_info.xml
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <LinearLayout style="@style/form_layout">        
-        <TextView android:text="@string/telephony_name_label" style="@style/form_label" />
-        <EditText android:id="@+id/name" style="@style/form_value" />
-    
-        <TextView android:text="@string/telephony_apn_label" style="@style/form_label" />
-        <EditText android:id="@+id/apn" style="@style/form_value" />
-    
-        <TextView android:text="@string/telephony_proxy_label" style="@style/form_label" />
-        <EditText android:id="@+id/proxy" style="@style/form_value" />
-    
-        <TextView android:text="@string/telephony_port_label" style="@style/form_label" />
-        <EditText android:id="@+id/port" style="@style/form_value" />
-
-        <TextView android:text="@string/telephony_user_label" style="@style/form_label" />
-        <EditText android:id="@+id/user" style="@style/form_value" />
-
-        <TextView android:text="@string/telephony_server_label" style="@style/form_label" />
-        <EditText android:id="@+id/server" style="@style/form_value" />
-
-        <TextView android:text="@string/telephony_password_label" style="@style/form_label" />
-        <EditText android:id="@+id/password" style="@style/form_value" />
- 
-        <TextView android:text="@string/telephony_mmsproxy_label" style="@style/form_label" />
-        <EditText android:id="@+id/mmsproxy" style="@style/form_value" />
-    
-        <TextView android:text="@string/telephony_mmsport_label" style="@style/form_label" />
-        <EditText android:id="@+id/mmsport" style="@style/form_value" />
-
-        <TextView android:text="@string/telephony_mmsc_label" style="@style/form_label" />
-        <EditText android:id="@+id/mmsc" style="@style/form_value" />
-        
-        <TextView android:text="@string/telephony_mcc_label" style="@style/form_label" />
-        <EditText android:id="@+id/mcc" style="@style/form_value" />
-        
-        <TextView android:text="@string/telephony_mnc_label" style="@style/form_label" />
-        <EditText android:id="@+id/mnc" style="@style/form_value" />
-    </LinearLayout>
-</ScrollView>
-
-    
diff --git a/res/layout/time_picker_activity.xml b/res/layout/time_picker_activity.xml
deleted file mode 100644
index 6e758a1..0000000
--- a/res/layout/time_picker_activity.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
-    <TimePicker android:id="@+id/timePicker"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true" />
-</RelativeLayout>
diff --git a/res/layout/usage_stats.xml b/res/layout/usage_stats.xml
new file mode 100755
index 0000000..727052d
--- /dev/null
+++ b/res/layout/usage_stats.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <TextView
+        android:text="@string/display_order_text"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" />
+
+    <Spinner
+        android:id="@+id/typeSpinner"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:entries="@array/usage_stats_display_order_types" />
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" > 
+        <TextView
+            android:text="@string/app_name_label"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="wrap_content"
+            android:paddingRight="6dip"
+            android:layout_height="wrap_content" />
+        <TextView
+            android:text="@string/launch_count_label"
+            android:paddingRight="6dip"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+        <TextView
+            android:text="@string/usage_time_label"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+    <ListView android:id="@+id/pkg_list"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:drawSelectorOnTop="false" />
+</LinearLayout>
diff --git a/res/layout/usage_stats_item.xml b/res/layout/usage_stats_item.xml
new file mode 100755
index 0000000..7ab0090
--- /dev/null
+++ b/res/layout/usage_stats_item.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2008, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:minHeight="?android:attr/listPreferredItemHeight">
+
+    <TextView android:id="@+id/package_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:paddingRight="6dip"
+        android:paddingLeft="12dip"
+        android:maxLines="1" />
+
+    <TextView android:id="@+id/launch_count"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:paddingRight="6dip"
+        android:paddingLeft="12dip"
+        android:maxLines="1" />
+
+    <TextView android:id="@+id/usage_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:paddingRight="6dip"
+        android:paddingLeft="12dip"
+        android:maxLines="1" />
+</LinearLayout>
+
diff --git a/res/layout/wifi_screen.xml b/res/layout/wifi_screen.xml
deleted file mode 100644
index a247f85..0000000
--- a/res/layout/wifi_screen.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Settings/assets/res/any/layout/wifi_screen.xml
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:paddingLeft="2dip"
-    android:paddingRight="2dip">
-
-    <LinearLayout 
-    	android:orientation="vertical"
-    	android:paddingLeft="6dip"
-    	android:paddingRight="6dip"
-    	android:paddingBottom="3dip"
-   		android:layout_width="fill_parent" android:layout_height="wrap_content">
-
-   		<TextView android:id="@+id/status"
-   			android:textSize="13sp" 
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content" 
-   			android:text="@string/wifi_screen_status_text" />
-
-	    <LinearLayout 
-	    	android:orientation="horizontal"
-	    	android:paddingLeft="3dip"
-	    	android:paddingRight="3dip"
-	    	android:paddingTop="0dip"
-	    	android:paddingBottom="0dip"
-	   		android:layout_height="wrap_content" android:layout_width="fill_parent">
-
-			<CheckBox android:id="@+id/dhcp"
-	   			android:textSize="13sp" 
-				android:layout_width="100dip"
-				android:layout_height="wrap_content" 
-                android:text="@string/wifi_screen_dhcp_text" />
-	   			
-			<CheckBox android:id="@+id/manual"
-	   			android:textSize="13sp" 
-				android:layout_width="100dip"
-                android:layout_height="wrap_content" 
-                android:text="@string/wifi_screen_manual_text" />
-
-	    </LinearLayout>    
-	    <LinearLayout 
-	    	android:orientation="horizontal"
-	    	android:paddingLeft="3dip"
-	    	android:paddingRight="3dip"
-	    	android:paddingTop="0dip"
-	    	android:paddingBottom="0dip"
-	   		android:layout_height="wrap_content" android:layout_width="fill_parent">
-
-	   		<TextView
-	   			android:textSize="13sp" 
-	   			android:textStyle="bold" 
-  	    	    android:paddingTop="6dip"
-	   			android:maxLines="1" 
-	   			android:layout_width="60dip" android:layout_height="wrap_content" 
-	   			android:text="@string/wifi_wlan_id" />
-	   			
-	   		<Spinner android:id="@+id/essid" 
-	   			android:textSize="13sp" 
-	   			android:maxLines="1" 
-	    		android:layout_marginLeft="3dip"
-	   			android:layout_width="150dip" 
-				android:layout_height="wrap_content">
-	   			<requestFocus/>
-            </Spinner>
-
-	    </LinearLayout>    
-
-	    <LinearLayout 
-	    	android:orientation="horizontal"
-	    	android:paddingLeft="3dip"
-	    	android:paddingRight="3dip"
-	    	android:paddingTop="0dip"
-	    	android:paddingBottom="0dip"
-	   		android:layout_height="wrap_content" android:layout_width="fill_parent">
-
-	   		<Button android:id="@+id/activate" 
-	   			android:textSize="13sp" 
-	    		android:layout_marginTop="2dip"
-	   			android:layout_width="100dip" android:layout_height="wrap_content" 
-	   			android:text="@string/wifi_screen_activate_text" />	   	
-
-	   		<Button android:id="@+id/test" 
-	   			android:textSize="13sp" 
-	    		android:layout_marginTop="2dip"
-	   			android:layout_width="100dip" android:layout_height="wrap_content" 
-	   			android:text="@string/wifi_screen_test_text" />	   	
-
-	    </LinearLayout>    
-
-        <LinearLayout android:id="@+id/manualconfig"
-			android:orientation="vertical"
-    	    android:paddingLeft="3dip"
-			android:paddingRight="3dip"
-			android:paddingBottom="3dip"
-			android:layout_width="fill_parent" android:layout_height="wrap_content">
-
-			<LinearLayout
-				android:orientation="horizontal"
-				android:paddingLeft="3dip"
-				android:paddingRight="3dip"
-				android:paddingTop="0dip"
-				android:paddingBottom="0dip"
-				android:layout_height="wrap_content" android:layout_width="fill_parent">
-
-				<TextView
-					android:textSize="13sp" 
-					android:textStyle="bold" 
-  	    	        android:paddingTop="6dip"
-					android:maxLines="1" 
-					android:layout_width="60dip" android:layout_height="wrap_content" 
-					android:text="@string/wifi_host_ip" />
-
-				<EditText android:id="@+id/ip" 
-					android:textSize="13sp" 
-					android:maxLines="1" 
-					android:layout_marginLeft="3dip"
-                    android:autoText="false"
-                    android:capitalize="none"
-					android:layout_width="150dip" android:layout_height="wrap_content"
-					android:text="@string/wifi_screen_ip_text" />
-
-			</LinearLayout>    
-
-			<LinearLayout 
-				android:orientation="horizontal"
-				android:paddingLeft="3dip"
-				android:paddingRight="3dip"
-				android:paddingTop="0dip"
-				android:paddingBottom="0dip"
-				android:layout_height="wrap_content" android:layout_width="fill_parent">
-
-				<TextView
-					android:textSize="13sp" 
-					android:textStyle="bold" 
-  	    	        android:paddingTop="6dip"
-					android:maxLines="1" 
-					android:layout_width="60dip" android:layout_height="wrap_content" 
-					android:text="@string/wifi_netmask_label" />
-
-				<EditText android:id="@+id/netmask" 
-					android:textSize="13sp" 
-					android:maxLines="1" 
-					android:layout_marginLeft="3dip"
-					android:layout_width="150dip" android:layout_height="wrap_content"
-                    android:autoText="false"
-                    android:capitalize="none"
-					android:text="@string/wifi_screen_netmask_text" />
-
-			</LinearLayout>    
-
-			<LinearLayout 
-				android:orientation="horizontal"
-				android:paddingLeft="3dip"
-				android:paddingRight="3dip"
-				android:paddingTop="0dip"
-				android:paddingBottom="0dip"
-				android:layout_height="wrap_content" android:layout_width="fill_parent">
-
-				<TextView
-					android:textSize="13sp" 
-					android:textStyle="bold" 
-  	    	        android:paddingTop="6dip"
-					android:maxLines="1" 
-					android:layout_width="60dip" android:layout_height="wrap_content" 
-					android:text="@string/wifi_gateway_label" />
-
-				<EditText android:id="@+id/gateway" 
-					android:textSize="13sp" 
-					android:maxLines="1" 
-					android:layout_marginLeft="3dip"
-					android:layout_width="150dip" android:layout_height="wrap_content"
-                    android:autoText="false"
-                    android:capitalize="none"
-					android:text="@string/wifi_screen_gateway_text" />
-
-			</LinearLayout>    
-
-			<LinearLayout 
-				android:orientation="horizontal"
-				android:paddingLeft="3dip"
-				android:paddingRight="3dip"
-				android:paddingTop="0dip"
-				android:paddingBottom="0dip"
-				android:layout_height="wrap_content" android:layout_width="fill_parent">
-
-				<TextView
-					android:textSize="13sp" 
-					android:textStyle="bold" 
-  	    	        android:paddingTop="6dip"
-					android:maxLines="1" 
-					android:layout_width="60dip" android:layout_height="wrap_content" 
-					android:text="@string/wifi_dns_label" />
-
-				<EditText android:id="@+id/dns" 
-					android:textSize="13sp" 
-					android:maxLines="1" 
-					android:layout_marginLeft="3dip"
-					android:layout_width="150dip" android:layout_height="wrap_content"
-                    android:autoText="false"
-                    android:capitalize="none"
-					android:text="@string/wifi_screen_dns_text" />
-
-			</LinearLayout>    
-
-		</LinearLayout>    
-
-
-    </LinearLayout>    
-</FrameLayout>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 57254e1..1874d89 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -53,4 +53,15 @@
     <!-- no translation found for wifi_sleep_policy_entries:0 (3804733751095821976) -->
     <!-- no translation found for wifi_sleep_policy_entries:1 (1549288661423279207) -->
     <!-- no translation found for wifi_sleep_policy_entries:2 (1986753720941888596) -->
+    <!-- no translation found for battery_history_type_spinner:0 (2372160040893842611) -->
+    <!-- no translation found for battery_history_type_spinner:1 (7042951832385599110) -->
+    <!-- no translation found for battery_history_type_spinner:2 (7643330117743172161) -->
+    <!-- no translation found for battery_history_type_spinner:3 (7984071435080498080) -->
+    <!-- no translation found for battery_history_which_spinner:0 (8777827398176661463) -->
+    <!-- no translation found for battery_history_which_spinner:1 (2351620008414691945) -->
+    <!-- no translation found for battery_history_which_spinner:2 (1233325583071371898) -->
+    <!-- no translation found for battery_history_which_spinner:3 (524850874274605031) -->
+    <!-- no translation found for usage_stats_display_order_types:0 (9077371706468756228) -->
+    <!-- no translation found for usage_stats_display_order_types:1 (1908750532762193304) -->
+    <!-- no translation found for usage_stats_display_order_types:2 (1213951670006606353) -->
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 75d5443..68ba53a 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -16,9 +16,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="device_info_default">"Neznámé"</string>
-    <string name="device_info_uptime">"Doba provozu"</string>
-    <string name="device_info_awaketime">"Doba provozu"</string>
-    <string name="device_info_asleeptime">"Doba spánku"</string>
     <string name="turn_on_radio">"Zapnout rádio"</string>
     <string name="turn_off_radio">"Vypnout rádio"</string>
     <string name="turn_on_qxdm">"Povolit protokol QXDM SD"</string>
@@ -52,14 +49,13 @@
     <string name="radioInfo_lac">"LAC"</string>
     <string name="radioInfo_cid">"CID"</string>
     <string name="sdcard_unmount">"Odpojit kartu SD"</string>
+    <!-- no translation found for sdcard_format (362497552060004057) -->
+    <skip />
     <string name="small_font">"Malá"</string>
     <string name="medium_font">"Střední"</string>
     <string name="large_font">"Velká"</string>
     <string name="font_size_save">"OK"</string>
     <string name="sdcard_setting">"Karta SD"</string>
-    <string name="screen_off_timeout_label">"Nevypínat při nabíjení"</string>
-    <string name="stay_on">"Obrazovka je při nabíjení vždy zapnuta"</string>
-    <string name="app_launcher_newView_text">"Nový AppLauncher"</string>
     <string name="battery_info_status_label">"Stav baterie:"</string>
     <string name="battery_info_scale_label">"Měřítko baterie:"</string>
     <string name="battery_info_level_label">"Stav baterie:"</string>
@@ -87,11 +83,6 @@
     <string name="battery_info_health_over_voltage">"Přepětí"</string>
     <string name="battery_info_health_unspecified_failure">"Neznámá chyba"</string>
     <string name="bluetooth">"Bluetooth"</string>
-    <string name="bluetooth_stopping">"Vypínání zařízení Bluetooth..."</string>
-    <string name="bluetooth_disabled">"Zapnout Bluetooth"</string>
-    <!-- no translation found for bluetooth_enabled (314506563815464155) -->
-    <skip />
-    <string name="bluetooth_enabling">"Zapínání zařízení Bluetooth..."</string>
     <string name="bluetooth_visibility">"Viditelné"</string>
     <string name="bluetooth_is_discoverable">"Zařízení je viditelné v intervalu <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> s."</string>
     <string name="bluetooth_not_discoverable">"Přepne zařízení do viditelného režimu"</string>
@@ -99,7 +90,6 @@
     <string name="bluetooth_device_name">"Název zařízení"</string>
     <string name="bluetooth_name_not_set">"Název není nastaven, použit název účtu"</string>
     <string name="bluetooth_scan_for_devices">"Vyhledat zařízení"</string>
-    <string name="bluetooth_clear_list">"Vymazat seznam zařízení"</string>
     <string name="bluetooth_disconnect_blank">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojeno."</string>
     <string name="bluetooth_connected">"Připojeno"</string>
     <string name="bluetooth_disconnected">"Odpojeno"</string>
@@ -108,17 +98,9 @@
     <!-- no translation found for bluetooth_unknown (644716244548801421) -->
     <skip />
     <string name="bluetooth_not_connected">"Párovat s tímto zařízením"</string>
-    <string name="bluetooth_failed_to_enable">"Bluetooth nelze zapnout"</string>
     <string name="bluetooth_pairing">"Párování..."</string>
-    <string name="failed_to_pair">"Párování se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g> se nezdařilo."</string>
-    <string name="failed_to_connect">"K zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> se nepodařilo připojit."</string>
     <string name="bluetooth_paired">"Párováno"</string>
-    <string name="bluetooth_paired_not_nearby">"Párováno"</string>
     <string name="bluetooth_device">"Náhlavní souprava či handsfree"</string>
-    <string name="bluetooth_disconnect">"Odpojit"</string>
-    <string name="bluetooth_connect">"Připojit"</string>
-    <string name="bluetooth_unpair">"Zrušit párování"</string>
-    <string name="bluetooth_pair">"Párovat"</string>
     <string name="progress_scanning">"Vyhledávání"</string>
     <string name="bluetooth_notif_ticker">"Požadavek na párování zařízení Bluetooth"</string>
     <string name="bluetooth_notif_title">"Požadavek na párování"</string>
@@ -136,16 +118,6 @@
     <string name="intent_sender_startactivity_text">"Spustit činnost <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label">"Účet:"</string>
-    <string name="keyguard_pw_mod_text">"Zvolit gesto odemknutí"</string>
-    <string name="keyguard_pin_mod_text">"Změna kódu PIN"</string>
-    <string name="keyguard_label">"Uzamčení kláves"</string>
-    <string name="keyguard_sim_pin_label">"Kód PIN karty SIM"</string>
-    <string name="keyguard_password_old_password_error_text">"Původní heslo bylo zadáno nesprávně. Zkuste to znovu."</string>
-    <string name="keyguard_password_button_text">"OK"</string>
-    <string name="keyguard_password_confirm_new_label">"Potvrďte nové heslo:"</string>
-    <string name="keyguard_password_new_label">"Nové heslo:"</string>
-    <string name="keyguard_password_old_label">"Staré heslo:"</string>
-    <string name="keyguard_password_mismatch_error_text">"Zadaná hesla se neshodují. Zadejte je znovu."</string>
     <string name="proxy_clear_text">"Vymazat"</string>
     <string name="proxy_port_label">"Port"</string>
     <string name="proxy_defaultView_text">"Obnovit výchozí nastavení"</string>
@@ -188,15 +160,13 @@
     <string name="radio_info_smsc_label">"SMSC:"</string>
     <string name="radio_info_smsc_update_label">"Aktualizovat"</string>
     <string name="radio_info_smsc_refresh_label">"Obnovit"</string>
+    <!-- no translation found for radio_info_toggle_dns_check_label (8292252930563286858) -->
+    <skip />
     <string name="band_mode_title">"Nastavit pásmo pro GSM a UMTS"</string>
     <string name="band_mode_loading">"Načítání seznamu pásem..."</string>
     <string name="band_mode_set">"Nastavit"</string>
     <string name="band_mode_failed">"Pásmo nenastaveno."</string>
     <string name="band_mode_succeeded">"Pásmo nastaveno."</string>
-    <string name="ringer_volume_ringer_mode_label">"Režim vyzvánění"</string>
-    <string name="ringer_volume_screen_increasing_text">"Rostoucí hlasitost vyzvánění"</string>
-    <string name="ringer_volume_ringtone_label">"Vyzváněcí tón"</string>
-    <string name="ringer_volume_instructions">"Hlasitost vyzvánění nastavíte pomocí tlačítek hlasitosti."</string>
     <string name="sdcard_changes_instructions">"Změna se projeví při příštím připojení kabelu USB."</string>
     <string name="sdcard_settings_screen_mass_storage_text">"Povolit velkokapacitní paměťové zařízení USB"</string>
     <string name="sdcard_settings_total_bytes_label">"Celková paměť (bajty):"</string>
@@ -208,20 +178,6 @@
     <string name="sdcard_settings_used_bytes_label">"Obsazená paměť (bajty):"</string>
     <string name="sdcard_settings_scanning_status">"Vyhledávání mediálních souborů na kartě SD..."</string>
     <string name="sdcard_settings_read_only_status">"Karta SD byla připojena pouze pro čtení."</string>
-    <string name="sdcard_removal_alert_title">"Nebezpečné odebrání karty SD."</string>
-    <string name="sdcard_unmountable_alert_title">"Kartu SD nelze číst."</string>
-    <string name="telephony_user_label">"Uživatel:"</string>
-    <string name="telephony_server_label">"Server:"</string>
-    <string name="telephony_name_label">"Jméno:"</string>
-    <string name="telephony_mmsc_label">"MMSC:"</string>
-    <string name="telephony_apn_label">"Název AP:"</string>
-    <string name="telephony_mcc_label">"MCC:"</string>
-    <string name="telephony_port_label">"Port:"</string>
-    <string name="telephony_password_label">"Heslo:"</string>
-    <string name="telephony_proxy_label">"Proxy server:"</string>
-    <string name="telephony_mnc_label">"MNC:"</string>
-    <string name="telephony_mmsproxy_label">"Proxy MMS:"</string>
-    <string name="telephony_mmsport_label">"Port MMS:"</string>
     <string name="next_label">"Další"</string>
     <string name="language_picker_title">"Národní prostředí"</string>
     <string name="select_your_language">"Zvolte jazyk"</string>
@@ -264,23 +220,12 @@
     <string name="bluetooth_settings_summary">"Umožňuje spravovat připojení, nastavit název zařízení a viditelnost"</string>
     <string name="bluetooth_pin_entry">"Požadavek na párování zařízení Bluetooth"</string>
     <string name="bluetooth_device_info">"Info o zařízení Bluetooth"</string>
-    <string name="bluetooth_pairing_msg">"Párování..."</string>
     <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Párování začnete zadáním kódu PIN."\n"(Zkuste 0000 nebo 1234.)"</string>
     <string name="bluetooth_error_title">"Upozornění"</string>
     <string name="bluetooth_pairing_error_message">"Při párování se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g> došlo k potížím."</string>
-    <string name="bluetooth_pairing_alternate_error_message">"Při pokusu o párování se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g> došlo k chybě. Zkuste jiný kód PIN."</string>
     <string name="bluetooth_pairing_pin_error_message">"Při párování se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g> došlo k potížím. Zadaný kód PIN je nesprávný."</string>
     <string name="bluetooth_connecting_error_message">"Při připojování k zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> došlo k potížím."</string>
-    <string name="bluetooth_new_data">"Zadejte nové údaje"</string>
-    <string name="bluetooth_new_data_confirm">"OK"</string>
-    <string name="bluetooth_new_data_cancel">"Zrušit"</string>
-    <string name="bluetooth_scan_for_new_devices">"Vyhledávání nových zařízení..."</string>
-    <string name="bluetooth_discoverability_panel_title">"Nastavit režim"</string>
-    <string name="bluetooth_discoverable">"Zařízení je viditelné v intervalu <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> s"</string>
-    <string name="bluetooth_connectable">"Pouze připojitelná zařízení"</string>
-    <string name="bluetooth_neither">"Zařízení není viditelné a nelze se k němu připojit"</string>
     <string name="bluetooth_preference_scan_title">"Vyhledat zařízení"</string>
-    <string name="bluetooth_preference_scan_summary">"Vyhledá zařízení pro párování"</string>
     <string name="bluetooth_device_context_connect">"Připojit"</string>
     <string name="bluetooth_device_context_disconnect">"Odpojit"</string>
     <string name="bluetooth_device_context_pair_connect">"Párovat a připojit"</string>
@@ -420,32 +365,24 @@
     <string name="sound_effects_enable_title">"Výběr se zvuky"</string>
     <string name="sound_effects_enable_summary_on">"Výběr na obrazovce je provázen zvuky"</string>
     <string name="sound_effects_enable_summary_off">"Výběr na obrazovce je provázen zvuky"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_title (1008791464029179529) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (426729807044947187) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (803791141563778934) -->
+    <skip />
     <string name="sync_settings">"Synchronizace dat"</string>
     <string name="sync_settings_summary">"Umožňuje vybrat aplikace pro synchronizaci"</string>
-    <string name="sync_settings_header_general_settings">"Obecná nastavení synchronizace"</string>
-    <string name="sync_settings_header_application_settings">"Nastavení synchronizace aplikace"</string>
-    <string name="sync_too_many_deletes">"Byl překročen limit mazání."</string>
-    <string name="sync_automatically">"Automatická synchronizace"</string>
-    <string name="sync_enabled">"Data jsou synchronizována automaticky"</string>
-    <string name="sync_disabled">"Umožňuje automatickou synchronizaci dat"</string>
-    <string name="sync_menu_sync_now">"Synchronizovat nyní"</string>
-    <string name="sync_menu_sync_cancel">"Zrušit synchronizaci"</string>
-    <string name="sync_gmail">"Gmail"</string>
-    <string name="sync_calendar">"Kalendář"</string>
-    <string name="sync_contacts">"Kontakty"</string>
-    <string name="sync_too_many_deletes_desc">"Smazané předměty: <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g>, typ synchronizace: <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>, účet: <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>. Jaká akce má být provedena?"</string>
-    <string name="sync_really_delete">"Smazat položky."</string>
-    <string name="sync_undo_deletes">"Vrátit mazání zpět."</string>
-    <string name="sync_do_nothing">"Neprovádět akci."</string>
-    <string name="sync_is_failing">"Nastaly potíže se synchronizací. Služba bude brzy obnovena."</string>
-    <string name="sync_plug"><font fgcolor="#ffffffff">"Vítá vás aplikace Google Sync"</font>" "\n"Nový pohled na synchronizaci dat v režii Google. Poskytuje vám přístup ke kontaktům, schůzkám a dalším náležitostem, ať jste kdekoli."</string>
     <string name="display_settings">"Nastavení zobrazení"</string>
     <string name="animations_title">"Animace"</string>
     <string name="animations_summary_on">"Zobrazit animace otevírání a zavírání oken"</string>
     <string name="animations_summary_off">"Animuje otevírání a zavírání oken"</string>
     <string name="brightness">"Jas"</string>
+    <!-- no translation found for brightness_summary (838917350127550703) -->
+    <skip />
     <string name="screen_timeout">"Interval vypnutí obrazovky"</string>
-    <string name="dim_screen">"Ztlumení obrazovky"</string>
+    <!-- no translation found for screen_timeout_summary (2905757633140605334) -->
+    <skip />
     <string name="sim_lock_settings">"Nastavení zámku karty SIM"</string>
     <string name="sim_lock_settings_category">"Nastavení zámku karty SIM"</string>
     <string name="sim_lock_settings_title">"Zámek karty SIM"</string>
@@ -493,13 +430,24 @@
     <string name="status_wifi_mac_address">"Adresa MAC sítě WiFi"</string>
     <string name="status_bt_address">"Adresa zařízení Bluetooth"</string>
     <string name="status_unavailable">"Nedostupný údaj"</string>
+    <!-- no translation found for status_network_traffic_stats (2089739529980224804) -->
+    <skip />
+    <!-- no translation found for status_network_traffic_summary (1456797220417923108) -->
+    <skip />
     <string name="status_up_time">"Doba provozu"</string>
     <string name="status_awake_time">"Doba provozu"</string>
     <string name="internal_memory">"Interní paměť telefonu"</string>
     <string name="sd_memory">"Karta SD"</string>
     <string name="memory_available">"Dostupná paměť"</string>
     <string name="memory_size">"Celková paměť"</string>
-    <string name="sd_eject">"Odpojit či vysunout kartu SD"</string>
+    <!-- no translation found for sd_eject (6915293408836853020) -->
+    <skip />
+    <!-- no translation found for sd_eject_summary (3315557796211542962) -->
+    <skip />
+    <!-- no translation found for sd_format (5448738337382712203) -->
+    <skip />
+    <!-- no translation found for sd_format_summary (6616491027883134004) -->
+    <skip />
     <string name="sd_unavailable">"Nedostupný údaj"</string>
     <string name="read_only">"(Pouze pro čtení)"</string>
     <string name="battery_status_title">"Stav baterie"</string>
@@ -538,6 +486,22 @@
     <string name="master_clear_gesture_prompt">"Proveďte gesto odemknutí"</string>
     <string name="master_clear_gesture_explanation">"Chcete-li potvrdit reset telefonu, musíte provést gesto odemknutí."</string>
     <string name="master_clear_failed">"Pokus o reset se nezdařil, protože služba System Clear není dostupná."</string>
+    <!-- no translation found for media_format_title (4671276096695789895) -->
+    <skip />
+    <!-- no translation found for media_format_summary (3805714639375830120) -->
+    <skip />
+    <!-- no translation found for media_format_desc (1142563222357820834) -->
+    <skip />
+    <!-- no translation found for media_format_button_text (370856400090190151) -->
+    <skip />
+    <!-- no translation found for media_format_final_desc (1776666694910717198) -->
+    <skip />
+    <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_prompt (3109349468816856670) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_explanation (4239529439389660159) -->
+    <skip />
     <string name="call_settings_title">"Nastavení hovorů"</string>
     <string name="call_settings_summary">"Umožňuje nastavit hlasovou schránku, přesměrování hovorů, další hovory na lince a ID volajícího"</string>
     <string name="network_settings_title">"Mobilní sítě"</string>
@@ -591,17 +555,25 @@
     <string name="lock_example_title">"Příklad gesta"</string>
     <string name="lock_example_message">"Spojte alespoň čtyři tečky."\n" "\n"Až budete připraveni provést vlastní gesto, zvolte tlačítko Další."</string>
     <string name="manageapplications_settings_title">"Správa aplikací"</string>
+    <!-- no translation found for manageapplications_settings_summary (6097117021500651232) -->
+    <skip />
     <string name="applications_settings">"Aplikace"</string>
     <string name="applications_settings_summary">"Umožňuje spravovat aplikace a nastavit klávesové zkratky rychlého spuštění"</string>
     <string name="applications_settings_header">"Nastavení aplikace"</string>
     <string name="install_applications">"Neznámé zdroje"</string>
     <string name="install_unknown_applications">"Povoluje instalaci aplikací mimo službu Market"</string>
     <string name="install_all_warning">"Váš telefon a osobní údaje jsou zranitelnější vůči útoku aplikací z neznámých zdrojů. Vyjadřujete souhlas, že nesete osobní odpovědnost za jakékoli škody způsobené na vašem telefonu nebo za ztrátu dat v důsledku používání těchto aplikací."</string>
-    <string name="manage_applications_title">"Spravovat aplikace"</string>
     <string name="application_info_label">"Info o aplikaci"</string>
     <string name="storage_label">"Paměť"</string>
     <string name="auto_launch_label">"Spustit jako výchozí"</string>
     <string name="permissions_label">"Povolení"</string>
+    <string name="cache_header_label">"Mezipaměť"</string>
+    <string name="clear_cache_btn_text">"Vymazat mezipaměť"</string>
+    <string name="cache_size_label">"Mezipaměť"</string>
+    <!-- no translation found for controls_label (7611113077086853799) -->
+    <skip />
+    <!-- no translation found for force_stop (7435006169872876756) -->
+    <skip />
     <string name="total_size_label">"Celkem"</string>
     <string name="application_size_label">"Aplikace"</string>
     <string name="data_size_label">"Data"</string>
@@ -614,6 +586,10 @@
     <string name="sort_order_alpha">"Řadit"</string>
     <string name="sort_order_size">"Řadit podle velikosti"</string>
     <string name="manage_space_text">"Správa paměti"</string>
+    <!-- no translation found for filter (2018011724373033887) -->
+    <skip />
+    <!-- no translation found for filter_dlg_title (6507663329723966854) -->
+    <skip />
     <string name="filter_apps_all">"Všechny"</string>
     <string name="filter_apps_third_party">"Aplikace třetí strany"</string>
     <string name="filter_apps_running">"Spuštěné"</string>
@@ -627,22 +603,24 @@
     <string name="app_not_found_dlg_text">"Aplikaci se nepodařilo najít na seznamu nainstalovaných aplikací."</string>
     <string name="clear_data_failed">"Nepodařilo se vymazat data aplikace."</string>
     <string name="security_settings_desc">"Tato aplikace má přístup k následujícím položkám telefonu:"</string>
-    <string name="computing_size">"Stále se počítá..."</string>
+    <!-- no translation found for computing_size (1599186977475211186) -->
+    <skip />
     <string name="invalid_size_value">"Nepodařilo se určit velikost balíčku"</string>
     <string name="empty_list_msg">"Žádné aplikace třetí strany nejsou nainstalovány."</string>
-    <string name="cache_header_label">"Mezipaměť"</string>
-    <string name="clear_cache_btn_text">"Vymazat mezipaměť"</string>
-    <string name="cache_size_label">"Mezipaměť"</string>
     <string name="language_settings">"Národní prostředí a text"</string>
     <string name="language_settings_summary">"Nastavení národního prostředí (jazyka a oblasti) a možností zadávání a automatických oprav textu"</string>
     <string name="language_category">"Nastavení národního prostředí"</string>
     <string name="text_category">"Nastavení textu"</string>
     <string name="phone_language">"Volba národního prostředí"</string>
+    <!-- no translation found for phone_language_summary (1809580675831352352) -->
+    <skip />
     <string name="auto_replace">"Automatické nahrazování"</string>
     <string name="auto_replace_summary">"Opravuje pravopisné chyby"</string>
     <string name="auto_caps">"Automatická velká písmena"</string>
     <string name="auto_caps_summary">"První písmeno ve větě je automaticky velké"</string>
     <string name="auto_punctuate">"Automatická interpunkce"</string>
+    <!-- no translation found for hardkeyboard_category (5957168411305769899) -->
+    <skip />
     <string name="auto_punctuate_summary">"Znak „.“ lze vložit dvěma stisky klávesy Mezerník."</string>
     <string name="show_password">"Zobrazování hesel"</string>
     <string name="show_password_summary">"Zadávané heslo je zobrazováno"</string>
@@ -690,4 +668,68 @@
     <string name="keep_screen_on_summary">"Obrazovka se při nabíjení nepřepne do režimu spánku"</string>
     <string name="allow_mock_location">"Povoluje simulované polohy"</string>
     <string name="allow_mock_location_summary">"Povoluje simulované polohy"</string>
+    <!-- no translation found for battery_history_known_apps (6907374478255786240) -->
+    <skip />
+    <!-- no translation found for gadget_picker_title (4335873961457985189) -->
+    <skip />
+    <!-- no translation found for battery_history_details_for (5189636461798594740) -->
+    <skip />
+    <!-- no translation found for battery_history_uid (1016606150528436298) -->
+    <skip />
+    <!-- no translation found for battery_history_network_usage (8010852371665217020) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_received (980307569180518302) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_sent (2501748768602119159) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_total (4444807574361642753) -->
+    <skip />
+    <!-- no translation found for battery_history_cpu_usage (2597353713014790877) -->
+    <skip />
+    <!-- no translation found for battery_history_user_time (6227507614894791359) -->
+    <skip />
+    <!-- no translation found for battery_history_system_time (2015862072724507547) -->
+    <skip />
+    <!-- no translation found for battery_history_total_time (3618703970098556104) -->
+    <skip />
+    <!-- no translation found for battery_history_starts (9137453931978571696) -->
+    <skip />
+    <!-- no translation found for battery_history_days (6387593985264923377) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (2593055276272350197) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (5608990219891318138) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (7397664460929461350) -->
+    <skip />
+    <!-- no translation found for battery_history_packages_sharing_this_uid (4101596071379250050) -->
+    <skip />
+    <!-- no translation found for battery_history_no_data (1177238743237067617) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor (2333488996028993982) -->
+    <skip />
+    <!-- no translation found for battery_history_used_by_packages (3000711380023436470) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage (3593133338613209024) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage_multi (4536084375991014508) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on (1377240025275657277) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_battery (536058210445081888) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_plugged (5019127390021871260) -->
+    <skip />
+    <!-- no translation found for usage_stats_label (5890846333487083609) -->
+    <skip />
+    <!-- no translation found for testing_usage_stats (7823048598893937339) -->
+    <skip />
+    <!-- no translation found for display_order_text (8592776965827565271) -->
+    <skip />
+    <!-- no translation found for app_name_label (2000949925256858308) -->
+    <skip />
+    <!-- no translation found for launch_count_label (4019444833263957024) -->
+    <skip />
+    <!-- no translation found for usage_time_label (295954901452833058) -->
+    <skip />
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 85252eb..6052904 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -53,4 +53,15 @@
     <!-- no translation found for wifi_sleep_policy_entries:0 (3804733751095821976) -->
     <!-- no translation found for wifi_sleep_policy_entries:1 (1549288661423279207) -->
     <!-- no translation found for wifi_sleep_policy_entries:2 (1986753720941888596) -->
+    <!-- no translation found for battery_history_type_spinner:0 (2372160040893842611) -->
+    <!-- no translation found for battery_history_type_spinner:1 (7042951832385599110) -->
+    <!-- no translation found for battery_history_type_spinner:2 (7643330117743172161) -->
+    <!-- no translation found for battery_history_type_spinner:3 (7984071435080498080) -->
+    <!-- no translation found for battery_history_which_spinner:0 (8777827398176661463) -->
+    <!-- no translation found for battery_history_which_spinner:1 (2351620008414691945) -->
+    <!-- no translation found for battery_history_which_spinner:2 (1233325583071371898) -->
+    <!-- no translation found for battery_history_which_spinner:3 (524850874274605031) -->
+    <!-- no translation found for usage_stats_display_order_types:0 (9077371706468756228) -->
+    <!-- no translation found for usage_stats_display_order_types:1 (1908750532762193304) -->
+    <!-- no translation found for usage_stats_display_order_types:2 (1213951670006606353) -->
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 563924b..4ee6b49 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -16,9 +16,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="device_info_default">"Unbekannt"</string>
-    <string name="device_info_uptime">"Betriebszeit"</string>
-    <string name="device_info_awaketime">"Aktivzeit"</string>
-    <string name="device_info_asleeptime">"Inaktivzeit"</string>
     <string name="turn_on_radio">"Radio einschalten"</string>
     <string name="turn_off_radio">"Radio ausschalten"</string>
     <string name="turn_on_qxdm">"QXDM-SD-Protokoll aktivieren"</string>
@@ -52,14 +49,13 @@
     <string name="radioInfo_lac">"LAC"</string>
     <string name="radioInfo_cid">"CID"</string>
     <string name="sdcard_unmount">"SD-Karte entnehmen"</string>
+    <!-- no translation found for sdcard_format (362497552060004057) -->
+    <skip />
     <string name="small_font">"Klein"</string>
     <string name="medium_font">"Mittel"</string>
     <string name="large_font">"Groß"</string>
     <string name="font_size_save">"OK"</string>
     <string name="sdcard_setting">"SD-Karte"</string>
-    <string name="screen_off_timeout_label">"Kein Timeout beim Laden"</string>
-    <string name="stay_on">"Display wird beim Laden nie ausgeschaltet"</string>
-    <string name="app_launcher_newView_text">"Neuer AppLauncher"</string>
     <string name="battery_info_status_label">"Akkustatus:"</string>
     <string name="battery_info_scale_label">"Akkuanzeige:"</string>
     <string name="battery_info_level_label">"Akkuladung:"</string>
@@ -87,11 +83,6 @@
     <string name="battery_info_health_over_voltage">"Überspannung"</string>
     <string name="battery_info_health_unspecified_failure">"Unbekannter Fehler"</string>
     <string name="bluetooth">"Bluetooth"</string>
-    <string name="bluetooth_stopping">"Bluetooth wird beendet..."</string>
-    <string name="bluetooth_disabled">"Bluetooth aktivieren"</string>
-    <!-- no translation found for bluetooth_enabled (314506563815464155) -->
-    <skip />
-    <string name="bluetooth_enabling">"Bluetooth wird aktiviert..."</string>
     <string name="bluetooth_visibility">"Erkennbar"</string>
     <string name="bluetooth_is_discoverable">"Für <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> Sekunden sichtbar..."</string>
     <string name="bluetooth_not_discoverable">"Geräteerkennung deaktivieren"</string>
@@ -99,7 +90,6 @@
     <string name="bluetooth_device_name">"Gerätename"</string>
     <string name="bluetooth_name_not_set">"Kein Name festgelegt, Kontoname wird verwendet"</string>
     <string name="bluetooth_scan_for_devices">"Scannen nach Geräten"</string>
-    <string name="bluetooth_clear_list">"Geräteliste löschen"</string>
     <string name="bluetooth_disconnect_blank">"Verbindung mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird getrennt."</string>
     <string name="bluetooth_connected">"Verbunden"</string>
     <string name="bluetooth_disconnected">"Nicht verbunden"</string>
@@ -108,17 +98,9 @@
     <!-- no translation found for bluetooth_unknown (644716244548801421) -->
     <skip />
     <string name="bluetooth_not_connected">"Pairing mit diesem Gerät"</string>
-    <string name="bluetooth_failed_to_enable">"Bluetooth kann nicht aktiviert werden"</string>
     <string name="bluetooth_pairing">"Pairing…"</string>
-    <string name="failed_to_pair">"Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nicht möglich"</string>
-    <string name="failed_to_connect">"Verbindung mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kann nicht hergestellt werden."</string>
     <string name="bluetooth_paired">"Gepaart"</string>
-    <string name="bluetooth_paired_not_nearby">"Gepaart"</string>
     <string name="bluetooth_device">"Freisprechfunktion/Headset"</string>
-    <string name="bluetooth_disconnect">"Verbindung trennen"</string>
-    <string name="bluetooth_connect">"Verbinden"</string>
-    <string name="bluetooth_unpair">"Pairing aufheben"</string>
-    <string name="bluetooth_pair">"Paaren"</string>
     <string name="progress_scanning">"Scannen..."</string>
     <string name="bluetooth_notif_ticker">"Bluetooth-Pairing-Anfrage"</string>
     <string name="bluetooth_notif_title">"Pairing-Anfrage"</string>
@@ -136,16 +118,6 @@
     <string name="intent_sender_startactivity_text">"<xliff:g id="ACTIVITY">activity</xliff:g> starten"</string>
     <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label">"Konto:"</string>
-    <string name="keyguard_pw_mod_text">"Sperrmuster auswählen"</string>
-    <string name="keyguard_pin_mod_text">"PIN ändern"</string>
-    <string name="keyguard_label">"Keyguard"</string>
-    <string name="keyguard_sim_pin_label">"SIM-PIN"</string>
-    <string name="keyguard_password_old_password_error_text">"Das alte Passwort ist falsch. Bitte versuchen Sie es erneut."</string>
-    <string name="keyguard_password_button_text">"OK"</string>
-    <string name="keyguard_password_confirm_new_label">"Neues Passwort bestätigen:"</string>
-    <string name="keyguard_password_new_label">"Neues Passwort:"</string>
-    <string name="keyguard_password_old_label">"Altes Passwort:"</string>
-    <string name="keyguard_password_mismatch_error_text">"Die beiden Passwörter stimmen nicht überein. Bitte geben Sie sie erneut ein."</string>
     <string name="proxy_clear_text">"Löschen"</string>
     <string name="proxy_port_label">"Port"</string>
     <string name="proxy_defaultView_text">"Standard wiederherstellen"</string>
@@ -188,15 +160,13 @@
     <string name="radio_info_smsc_label">"SMSC:"</string>
     <string name="radio_info_smsc_update_label">"Aktualisierung"</string>
     <string name="radio_info_smsc_refresh_label">"Aktualisieren"</string>
+    <!-- no translation found for radio_info_toggle_dns_check_label (8292252930563286858) -->
+    <skip />
     <string name="band_mode_title">"GSM-/UMTS-Band festlegen"</string>
     <string name="band_mode_loading">"Bandliste wird geladen..."</string>
     <string name="band_mode_set">"Festlegen"</string>
     <string name="band_mode_failed">"Fehlgeschlagen"</string>
     <string name="band_mode_succeeded">"Erfolgreich"</string>
-    <string name="ringer_volume_ringer_mode_label">"Klingeltonmodus"</string>
-    <string name="ringer_volume_screen_increasing_text">"Ansteigender Klingelton"</string>
-    <string name="ringer_volume_ringtone_label">"Klingelton"</string>
-    <string name="ringer_volume_instructions">"Klingeltonlautstärke mithilfe der Lautstärketasten anpassen"</string>
     <string name="sdcard_changes_instructions">"Die Änderungen werden nach dem erneuten Anschließen des USB-Kabels übernommen."</string>
     <string name="sdcard_settings_screen_mass_storage_text">"USB-Massenspeicher aktivieren"</string>
     <string name="sdcard_settings_total_bytes_label">"Bytes insgesamt:"</string>
@@ -208,20 +178,6 @@
     <string name="sdcard_settings_used_bytes_label">"Verwendete Bytes:"</string>
     <string name="sdcard_settings_scanning_status">"SD-Karte wird auf Medien gescannt..."</string>
     <string name="sdcard_settings_read_only_status">"SD-Karte schreibgeschützt aktiviert"</string>
-    <string name="sdcard_removal_alert_title">"Unsichere Entfernung der SD-Karte!"</string>
-    <string name="sdcard_unmountable_alert_title">"SD-Karte nicht lesbar"</string>
-    <string name="telephony_user_label">"Nutzer:"</string>
-    <string name="telephony_server_label">"Server:"</string>
-    <string name="telephony_name_label">"Name:"</string>
-    <string name="telephony_mmsc_label">"MMSC:"</string>
-    <string name="telephony_apn_label">"APN:"</string>
-    <string name="telephony_mcc_label">"MCC:"</string>
-    <string name="telephony_port_label">"Port:"</string>
-    <string name="telephony_password_label">"Passwort:"</string>
-    <string name="telephony_proxy_label">"Proxy:"</string>
-    <string name="telephony_mnc_label">"MNC:"</string>
-    <string name="telephony_mmsproxy_label">"MMS-Proxy:"</string>
-    <string name="telephony_mmsport_label">"MMS-Port:"</string>
     <string name="next_label">"Weiter"</string>
     <string name="language_picker_title">"Sprache"</string>
     <string name="select_your_language">"Sprache auswählen"</string>
@@ -264,23 +220,12 @@
     <string name="bluetooth_settings_summary">"Verbindungen, Gerätenamen und Erkennbarkeit verwalten"</string>
     <string name="bluetooth_pin_entry">"Bluetooth-Pairing-Anfrage"</string>
     <string name="bluetooth_device_info">"Bluetooth-Geräteinfo"</string>
-    <string name="bluetooth_pairing_msg">"Pairing…"</string>
     <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"PIN für Pairing eingeben."\n"(Versuchen Sie 0000 oder 1234.)"</string>
     <string name="bluetooth_error_title">"Achtung"</string>
     <string name="bluetooth_pairing_error_message">"Beim Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist ein Problem aufgetreten."</string>
-    <string name="bluetooth_pairing_alternate_error_message">"Beim Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist ein Problem aufgetreten. Versuchen Sie eine andere PIN."</string>
     <string name="bluetooth_pairing_pin_error_message">"Beim Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist ein Problem aufgetreten, da die eingegebene PIN falsch ist."</string>
     <string name="bluetooth_connecting_error_message">"Beim Verbindungsaufbau mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist ein Problem aufgetreten."</string>
-    <string name="bluetooth_new_data">"Neue Daten eingeben"</string>
-    <string name="bluetooth_new_data_confirm">"OK"</string>
-    <string name="bluetooth_new_data_cancel">"Abbrechen"</string>
-    <string name="bluetooth_scan_for_new_devices">"Scannen nach neuen Geräten..."</string>
-    <string name="bluetooth_discoverability_panel_title">"Aktion:"</string>
-    <string name="bluetooth_discoverable">"Für <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> Sekunden sichtbar"</string>
-    <string name="bluetooth_connectable">"Verbindung möglich"</string>
-    <string name="bluetooth_neither">"Erkennung und Verbindung nicht möglich"</string>
     <string name="bluetooth_preference_scan_title">"Scan nach Geräten"</string>
-    <string name="bluetooth_preference_scan_summary">"Geräte für Pairing suchen"</string>
     <string name="bluetooth_device_context_connect">"Verbinden"</string>
     <string name="bluetooth_device_context_disconnect">"Verbindung trennen"</string>
     <string name="bluetooth_device_context_pair_connect">"Paaren und verbinden"</string>
@@ -395,8 +340,8 @@
     <string name="status_disconnecting">"Verbindung wird getrennt..."</string>
     <string name="status_disconnected">"Nicht verbunden"</string>
     <string name="status_failed">"Fehlgeschlagen"</string>
-    <string name="sound_and_display_settings">"Sound und Display"</string>
-    <string name="sound_settings">"Soundeinstellungen"</string>
+    <string name="sound_and_display_settings">"Töne und Display"</string>
+    <string name="sound_settings">"Toneinstellungen"</string>
     <string name="sound_and_display_settings_summary">"Klingeltöne, Benachrichtigungen und Helligkeit festlegen"</string>
     <string name="silent_mode_title">"Lautlosmodus"</string>
     <string name="silent_mode_summary">"Alle Töne außer für Medien und Warnungen sind stummgeschaltet"</string>
@@ -414,38 +359,30 @@
     <string name="notification_sound_dialog_title">"Benachrichtigungston auswählen"</string>
     <string name="media_volume_title">"Medienlautstärke"</string>
     <string name="media_volume_summary">"Lautstärke für Musik und Videos festlegen"</string>
-    <string name="dtmf_tone_enable_title">"Akustische Tastensounds"</string>
-    <string name="dtmf_tone_enable_summary_on">"Bei Verwendung der Wähltastatur Sound abspielen"</string>
-    <string name="dtmf_tone_enable_summary_off">"Bei Verwendung der Wähltastatur Sound abspielen"</string>
+    <string name="dtmf_tone_enable_title">"Tastentöne"</string>
+    <string name="dtmf_tone_enable_summary_on">"Töne bei Telefonwahl"</string>
+    <string name="dtmf_tone_enable_summary_off">"Töne bei Telefonwahl"</string>
     <string name="sound_effects_enable_title">"Akustische Auswahl"</string>
-    <string name="sound_effects_enable_summary_on">"Bei Display-Auswahl Sound abspielen"</string>
-    <string name="sound_effects_enable_summary_off">"Bei Display-Auswahl Sound abspielen"</string>
+    <string name="sound_effects_enable_summary_on">"Ton bei Auswahl auf Display"</string>
+    <string name="sound_effects_enable_summary_off">"Ton bei Auswahl auf Display"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_title (1008791464029179529) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (426729807044947187) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (803791141563778934) -->
+    <skip />
     <string name="sync_settings">"Datensynchronisierung"</string>
     <string name="sync_settings_summary">"Auswählen, welche Anwendungen synchronisiert werden"</string>
-    <string name="sync_settings_header_general_settings">"Allgemeine Synchronisierungseinstellungen"</string>
-    <string name="sync_settings_header_application_settings">"Synchronisierungseinstellungen der Anwendung"</string>
-    <string name="sync_too_many_deletes">"Löschbegrenzung überschritten"</string>
-    <string name="sync_automatically">"Autom. Synchronisierung"</string>
-    <string name="sync_enabled">"Daten automatisch synchronisieren"</string>
-    <string name="sync_disabled">"Zur automatischen Datensynchronisierung auswählen"</string>
-    <string name="sync_menu_sync_now">"Jetzt synchronisieren"</string>
-    <string name="sync_menu_sync_cancel">"Synchronisierung abbrechen"</string>
-    <string name="sync_gmail">"Google Mail"</string>
-    <string name="sync_calendar">"Google Kalender"</string>
-    <string name="sync_contacts">"Kontakte"</string>
-    <string name="sync_too_many_deletes_desc">"Für <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>, Konto <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>, liegen <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> gelöschte Elemente vor. Was möchten Sie tun?"</string>
-    <string name="sync_really_delete">"Elemente löschen"</string>
-    <string name="sync_undo_deletes">"Löschen rückgängig machen"</string>
-    <string name="sync_do_nothing">"Im Moment nichts unternehmen"</string>
-    <string name="sync_is_failing">"Bei der Synchronisierung treten derzeit Probleme auf. Sie wird in Kürze fortgesetzt."</string>
-    <string name="sync_plug"><font fgcolor="#ffffffff">"Willkommen bei Google Sync!"</font>\n"Mit dieser Funktion von Google können Sie Ihre Daten synchronisieren, um auf Ihre Kontakte, Termine und vieles mehr zuzugreifen - wo immer Sie auch sind!"</string>
     <string name="display_settings">"Display-Einstellungen"</string>
     <string name="animations_title">"Animation"</string>
     <string name="animations_summary_on">"Animation beim Öffnen/Schließen von Fenstern anzeigen"</string>
     <string name="animations_summary_off">"Animation beim Öffnen/Schließen von Fenstern anzeigen"</string>
     <string name="brightness">"Helligkeit"</string>
+    <!-- no translation found for brightness_summary (838917350127550703) -->
+    <skip />
     <string name="screen_timeout">"Display-Timeout"</string>
-    <string name="dim_screen">"Display dimmen"</string>
+    <!-- no translation found for screen_timeout_summary (2905757633140605334) -->
+    <skip />
     <string name="sim_lock_settings">"Einstellungen"</string>
     <string name="sim_lock_settings_category">"SIM-Kartensperrung einrichten"</string>
     <string name="sim_lock_settings_title">"SIM-Kartensperrung"</string>
@@ -493,13 +430,24 @@
     <string name="status_wifi_mac_address">"WLAN-MAC-Adresse"</string>
     <string name="status_bt_address">"Bluetooth-Adresse"</string>
     <string name="status_unavailable">"Nicht verfügbar"</string>
+    <!-- no translation found for status_network_traffic_stats (2089739529980224804) -->
+    <skip />
+    <!-- no translation found for status_network_traffic_summary (1456797220417923108) -->
+    <skip />
     <string name="status_up_time">"Betriebszeit"</string>
     <string name="status_awake_time">"Aktivzeit"</string>
     <string name="internal_memory">"Interner Telefonspeicher"</string>
     <string name="sd_memory">"SD-Karte"</string>
     <string name="memory_available">"Verfügbarer Speicher"</string>
     <string name="memory_size">"Gesamtspeicher"</string>
-    <string name="sd_eject">"SD-Karte entnehmen"</string>
+    <!-- no translation found for sd_eject (6915293408836853020) -->
+    <skip />
+    <!-- no translation found for sd_eject_summary (3315557796211542962) -->
+    <skip />
+    <!-- no translation found for sd_format (5448738337382712203) -->
+    <skip />
+    <!-- no translation found for sd_format_summary (6616491027883134004) -->
+    <skip />
     <string name="sd_unavailable">"Nicht verfügbar"</string>
     <string name="read_only">"(schreibgeschützt)"</string>
     <string name="battery_status_title">"Akkustatus"</string>
@@ -538,6 +486,22 @@
     <string name="master_clear_gesture_prompt">"Bitte zeichnen Sie Ihr Entsperrungsmuster."</string>
     <string name="master_clear_gesture_explanation">"Sie müssen Ihr Entsperrungsmuster eingeben, um das Zurücksetzen des Telefons zu bestätigen."</string>
     <string name="master_clear_failed">"Die Zurücksetzung konnte nicht durchgeführt werden, da der Service zur Systembereinigung nicht verfügbar ist."</string>
+    <!-- no translation found for media_format_title (4671276096695789895) -->
+    <skip />
+    <!-- no translation found for media_format_summary (3805714639375830120) -->
+    <skip />
+    <!-- no translation found for media_format_desc (1142563222357820834) -->
+    <skip />
+    <!-- no translation found for media_format_button_text (370856400090190151) -->
+    <skip />
+    <!-- no translation found for media_format_final_desc (1776666694910717198) -->
+    <skip />
+    <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_prompt (3109349468816856670) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_explanation (4239529439389660159) -->
+    <skip />
     <string name="call_settings_title">"Anrufeinstellungen"</string>
     <string name="call_settings_summary">"Mailbox, Anrufweiterleitung, Anklopfen, Anruferkennung einrichten"</string>
     <string name="network_settings_title">"Mobile Netzwerke"</string>
@@ -548,7 +512,7 @@
     <string name="location_neighborhood_level">"Standort bestimmt von WLAN und/oder mobilen Netzwerken"</string>
     <string name="location_gps">"GPS-Satelliten aktivieren"</string>
     <string name="location_street_level">"Auf Straßenebene lokalisieren (deaktivieren, um Akku zu sparen)"</string>
-    <string name="location_gps_disabled">"Auf Straßenebene lokalisieren (höhere Akkuleistung, zusätzl. Himmelsansicht)"</string>
+    <string name="location_gps_disabled">"Auf Straßenebene lokalisieren (höherer Akkuverbrauch, im Freien)"</string>
     <string name="about_settings">"Telefoninfo"</string>
     <string name="about_settings_summary">"Rechtliche Hinweise, Telefonstatus und Softwareversion anzeigen"</string>
     <string name="legal_information">"Rechtliche Hinweise"</string>
@@ -591,17 +555,25 @@
     <string name="lock_example_title">"Beispielmuster"</string>
     <string name="lock_example_message">"Verbinden Sie mindestens vier Punkte."\n" "\n"Wählen Sie \"Weiter\", um ein eigenes Muster aufzuzeichnen."</string>
     <string name="manageapplications_settings_title">"Anwendungen verwalten"</string>
+    <!-- no translation found for manageapplications_settings_summary (6097117021500651232) -->
+    <skip />
     <string name="applications_settings">"Anwendungen"</string>
     <string name="applications_settings_summary">"Anwendungen verwalten, Tastenkombinationen für Schnellstart einrichten"</string>
     <string name="applications_settings_header">"Anwendungen"</string>
     <string name="install_applications">"Unbekannte Quellen"</string>
     <string name="install_unknown_applications">"Installation von Nicht-Market-Anwendungen zulassen"</string>
     <string name="install_all_warning">"Anwendungen aus unbekannten Quellen können gefährlich für Ihr Telefon und Ihre persönlichen Daten sein. Sie stimmen zu, dass Sie die Verantwortung für alle Schäden an Ihrem Telefon oder jegliche Datenverluste tragen, die aus der Verwendung dieser Anwendungen entstehen können."</string>
-    <string name="manage_applications_title">"Anwendungen verwalten"</string>
     <string name="application_info_label">"Anwendungsinfo"</string>
     <string name="storage_label">"Speicher"</string>
     <string name="auto_launch_label">"Standardmäßig starten"</string>
     <string name="permissions_label">"Berechtigungen"</string>
+    <string name="cache_header_label">"Cache"</string>
+    <string name="clear_cache_btn_text">"Cache löschen"</string>
+    <string name="cache_size_label">"Cache"</string>
+    <!-- no translation found for controls_label (7611113077086853799) -->
+    <skip />
+    <!-- no translation found for force_stop (7435006169872876756) -->
+    <skip />
     <string name="total_size_label">"Insgesamt"</string>
     <string name="application_size_label">"Anwendung"</string>
     <string name="data_size_label">"Daten"</string>
@@ -614,6 +586,10 @@
     <string name="sort_order_alpha">"Sortieren"</string>
     <string name="sort_order_size">"Nach Größe sortieren"</string>
     <string name="manage_space_text">"Speicherplatz verwalten"</string>
+    <!-- no translation found for filter (2018011724373033887) -->
+    <skip />
+    <!-- no translation found for filter_dlg_title (6507663329723966854) -->
+    <skip />
     <string name="filter_apps_all">"Alle"</string>
     <string name="filter_apps_third_party">"Drittanbieter"</string>
     <string name="filter_apps_running">"Wird ausgeführt"</string>
@@ -627,22 +603,24 @@
     <string name="app_not_found_dlg_text">"Diese Anwendung wurde in der Liste der installierten Anwendungen nicht gefunden."</string>
     <string name="clear_data_failed">"Anwendungsdaten können nicht gelöscht werden."</string>
     <string name="security_settings_desc">"Diese Anwendung kann auf die folgenden Funktionen Ihres Telefons zugreifen:"</string>
-    <string name="computing_size">"Berechnung läuft..."</string>
+    <!-- no translation found for computing_size (1599186977475211186) -->
+    <skip />
     <string name="invalid_size_value">"Paketgröße kann nicht berechnet werden"</string>
     <string name="empty_list_msg">"Sie haben keine Anwendungen von Drittanbietern installiert."</string>
-    <string name="cache_header_label">"Cache"</string>
-    <string name="clear_cache_btn_text">"Cache löschen"</string>
-    <string name="cache_size_label">"Cache"</string>
     <string name="language_settings">"Gebietsschema und Text"</string>
     <string name="language_settings_summary">"Optionen für Gebietsschema (Sprache und Region), Texteingabe und Autokorrektur festlegen"</string>
     <string name="language_category">"Ländereinstellung"</string>
     <string name="text_category">"Texteinstellungen"</string>
     <string name="phone_language">"Sprache wählen"</string>
+    <!-- no translation found for phone_language_summary (1809580675831352352) -->
+    <skip />
     <string name="auto_replace">"Autom. Ersetzung"</string>
     <string name="auto_replace_summary">"Tippfehler korrigieren"</string>
     <string name="auto_caps">"Autom. Großschreibung"</string>
     <string name="auto_caps_summary">"Jeden Satz mit einem Großbuchstaben beginnen"</string>
     <string name="auto_punctuate">"Autom. Zeichensetzung"</string>
+    <!-- no translation found for hardkeyboard_category (5957168411305769899) -->
+    <skip />
     <string name="auto_punctuate_summary">"Leertaste zweimal drücken, um \".\" hinzuzufügen"</string>
     <string name="show_password">"Sichtbare Passwörter"</string>
     <string name="show_password_summary">"Passwort bei der Eingabe anzeigen"</string>
@@ -690,4 +668,68 @@
     <string name="keep_screen_on_summary">"Display wird beim Laden nie in den Ruhezustand versetzt"</string>
     <string name="allow_mock_location">"Falsche Standorte zulassen"</string>
     <string name="allow_mock_location_summary">"Falsche Standorte zulassen"</string>
+    <!-- no translation found for battery_history_known_apps (6907374478255786240) -->
+    <skip />
+    <!-- no translation found for gadget_picker_title (4335873961457985189) -->
+    <skip />
+    <!-- no translation found for battery_history_details_for (5189636461798594740) -->
+    <skip />
+    <!-- no translation found for battery_history_uid (1016606150528436298) -->
+    <skip />
+    <!-- no translation found for battery_history_network_usage (8010852371665217020) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_received (980307569180518302) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_sent (2501748768602119159) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_total (4444807574361642753) -->
+    <skip />
+    <!-- no translation found for battery_history_cpu_usage (2597353713014790877) -->
+    <skip />
+    <!-- no translation found for battery_history_user_time (6227507614894791359) -->
+    <skip />
+    <!-- no translation found for battery_history_system_time (2015862072724507547) -->
+    <skip />
+    <!-- no translation found for battery_history_total_time (3618703970098556104) -->
+    <skip />
+    <!-- no translation found for battery_history_starts (9137453931978571696) -->
+    <skip />
+    <!-- no translation found for battery_history_days (6387593985264923377) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (2593055276272350197) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (5608990219891318138) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (7397664460929461350) -->
+    <skip />
+    <!-- no translation found for battery_history_packages_sharing_this_uid (4101596071379250050) -->
+    <skip />
+    <!-- no translation found for battery_history_no_data (1177238743237067617) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor (2333488996028993982) -->
+    <skip />
+    <!-- no translation found for battery_history_used_by_packages (3000711380023436470) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage (3593133338613209024) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage_multi (4536084375991014508) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on (1377240025275657277) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_battery (536058210445081888) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_plugged (5019127390021871260) -->
+    <skip />
+    <!-- no translation found for usage_stats_label (5890846333487083609) -->
+    <skip />
+    <!-- no translation found for testing_usage_stats (7823048598893937339) -->
+    <skip />
+    <!-- no translation found for display_order_text (8592776965827565271) -->
+    <skip />
+    <!-- no translation found for app_name_label (2000949925256858308) -->
+    <skip />
+    <!-- no translation found for launch_count_label (4019444833263957024) -->
+    <skip />
+    <!-- no translation found for usage_time_label (295954901452833058) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index a6ede63..0f6d3c3 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -765,7 +765,6 @@
     <skip />
     <!-- no translation found for sync_menu_sync_cancel (5977866540414760428) -->
     <skip />
-    <string name="sync_gmail">"Google Mail"</string>
     <!-- no translation found for sync_calendar (596997436997648960) -->
     <skip />
     <!-- no translation found for sync_contacts (4740241811440373346) -->
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
deleted file mode 100644
index f29404e..0000000
--- a/res/values-es-rUS/strings.xml
+++ /dev/null
@@ -1,883 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="device_info_default">"Desconocido"</string>
-    <string name="device_info_uptime">"Tiempo de funcionamiento"</string>
-    <string name="device_info_awaketime">"Tiempo de actividad"</string>
-    <string name="device_info_asleeptime">"Tiempo de inactividad"</string>
-    <string name="turn_on_radio">"Encender radio"</string>
-    <string name="turn_off_radio">"Apagar radio"</string>
-    <string name="turn_on_qxdm">"Habilitar registro QXDM SD"</string>
-    <string name="turn_off_qxdm">"Deshabilitar registro QXDM SD"</string>
-    <string name="radioInfo_menu_viewADN">"Ver agenda de SIM"</string>
-    <string name="radioInfo_menu_viewFDN">"Ver números de marcado fijo"</string>
-    <string name="radioInfo_menu_viewSDN">"Ver números de marcado de servicio"</string>
-    <string name="radioInfo_menu_getPDP">"Obtener lista PDP"</string>
-    <string name="radioInfo_menu_enableData">"Habilitar conexión de datos"</string>
-    <string name="radioInfo_menu_disableData">"Deshabilitar conexión de datos"</string>
-    <!-- no translation found for radioInfo_menu_enableDataOnBoot (1926825935390738605) -->
-    <skip />
-    <!-- no translation found for radioInfo_menu_disableDataOnBoot (1229911918312837466) -->
-    <skip />
-    <string name="radioInfo_service_in">"En servicio"</string>
-    <string name="radioInfo_service_out">"Fuera de servicio"</string>
-    <string name="radioInfo_service_emergency">"Sólo llamadas de emergencia"</string>
-    <string name="radioInfo_service_off">"Radio apagada"</string>
-    <string name="radioInfo_roaming_in">"Itinerancia"</string>
-    <string name="radioInfo_roaming_not">"No itinerancia"</string>
-    <string name="radioInfo_phone_idle">"Inactivo"</string>
-    <string name="radioInfo_phone_ringing">"Sonando"</string>
-    <string name="radioInfo_phone_offhook">"Llamada en curso"</string>
-    <string name="radioInfo_data_disconnected">"Desconectado"</string>
-    <string name="radioInfo_data_connecting">"Conectando"</string>
-    <string name="radioInfo_data_connected">"Conectado"</string>
-    <!-- no translation found for radioInfo_data_suspended (4953150687356763202) -->
-    <skip />
-    <string name="radioInfo_unknown">"desconocido"</string>
-    <string name="radioInfo_display_packets">"paq."</string>
-    <string name="radioInfo_display_bytes">"bytes"</string>
-    <string name="radioInfo_display_dbm">"dBm"</string>
-    <string name="radioInfo_display_asu">"asu"</string>
-    <string name="radioInfo_lac">"LAC"</string>
-    <string name="radioInfo_cid">"CID"</string>
-    <string name="sdcard_unmount">"Desmontar tarjeta SD"</string>
-    <string name="small_font">"Pequeño"</string>
-    <string name="medium_font">"Mediano"</string>
-    <string name="large_font">"Grande"</string>
-    <string name="font_size_save">"Aceptar"</string>
-    <string name="sdcard_setting">"Tarjeta SD"</string>
-    <string name="screen_off_timeout_label">"Tiempo de espera de apagado de pantalla"</string>
-    <string name="stay_on">"Permanece encendido mientras está enchufado"</string>
-    <string name="app_launcher_newView_text">"Nuevo AppLauncher"</string>
-    <string name="battery_info_status_label">"Estado de la batería:"</string>
-    <string name="battery_info_scale_label">"Escala de batería:"</string>
-    <string name="battery_info_level_label">"Nivel de batería:"</string>
-    <string name="battery_info_health_label">"Salud de batería:"</string>
-    <string name="battery_info_technology_label">"Tecnología de la batería:"</string>
-    <string name="battery_info_voltage_label">"Tensión de la batería:"</string>
-    <string name="battery_info_voltage_units">"mV"</string>
-    <string name="battery_info_temperature_label">"Temperatura de la batería:"</string>
-    <string name="battery_info_temperature_units">"° C"</string>
-    <!-- no translation found for battery_info_uptime (1195623257533912354) -->
-    <skip />
-    <!-- no translation found for battery_info_awake_battery (1529944627925423756) -->
-    <skip />
-    <!-- no translation found for battery_info_awake_plugged (7272044960586959459) -->
-    <skip />
-    <!-- no translation found for battery_info_screen_on (832651425042656482) -->
-    <skip />
-    <string name="battery_info_status_unknown">"Desconocido"</string>
-    <string name="battery_info_status_charging">"Cargando"</string>
-    <string name="battery_info_status_charging_ac">"(CA)"</string>
-    <string name="battery_info_status_charging_usb">"(USB)"</string>
-    <string name="battery_info_status_discharging">"Descargando"</string>
-    <string name="battery_info_status_not_charging">"No cargando"</string>
-    <string name="battery_info_status_full">"Completo"</string>
-    <string name="battery_info_health_unknown">"Desconocido"</string>
-    <string name="battery_info_health_good">"Buena"</string>
-    <string name="battery_info_health_overheat">"Recalentamiento"</string>
-    <string name="battery_info_health_dead">"Muerta"</string>
-    <string name="battery_info_health_over_voltage">"Sobretensión"</string>
-    <string name="battery_info_health_unspecified_failure">"Fallo no especificado"</string>
-    <string name="bluetooth">"Bluetooth"</string>
-    <string name="bluetooth_stopping">"Desconexión de Bluetooth…"</string>
-    <string name="bluetooth_disabled">"El Bluetooth está apagado actualmente."</string>
-    <string name="bluetooth_enabled">"El Bluetooth está activado actualmente"</string>
-    <string name="bluetooth_enabling">"Habilitando Bluetooth…"</string>
-    <string name="bluetooth_visibility">"Visibilidad"</string>
-    <string name="bluetooth_is_discoverable">"El dispositivo es detectable"</string>
-    <string name="bluetooth_not_discoverable">"Dispositivo no detectable"</string>
-    <string name="bluetooth_devices">"Dispositivos Bluetooth"</string>
-    <string name="bluetooth_device_name">"Nombre del dispositivo"</string>
-    <string name="bluetooth_name_not_set">"Ningún nombre establecido, usando nombre de cuenta"</string>
-    <string name="bluetooth_scan_for_devices">"Buscar dispositivos Bluetooth"</string>
-    <string name="bluetooth_clear_list">"Borrar lista de dispositivos"</string>
-    <string name="bluetooth_disconnect_blank">"¿Desconectar %1$s?"</string>
-    <string name="bluetooth_connected">"Conectado"</string>
-    <!-- no translation found for bluetooth_disconnected (779512372559332317) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnecting (613305857810977890) -->
-    <skip />
-    <string name="bluetooth_connecting">"Conectando…"</string>
-    <string name="bluetooth_unknown">"Desconocido"</string>
-    <string name="bluetooth_not_connected">"No está conectado"</string>
-    <!-- no translation found for bluetooth_failed_to_enable (10261849074413402) -->
-    <skip />
-    <!-- no translation found for bluetooth_pairing (8284273555047880444) -->
-    <skip />
-    <!-- no translation found for failed_to_pair (5265027255173301781) -->
-    <skip />
-    <string name="failed_to_connect">"Fallo al conectar a "</string>
-    <string name="bluetooth_paired">"Emparejado"</string>
-    <!-- no translation found for bluetooth_paired_not_nearby (2890021978719716438) -->
-    <skip />
-    <string name="bluetooth_device">"manos libres / auriculares"</string>
-    <!-- no translation found for bluetooth_disconnect (4070053533691322466) -->
-    <skip />
-    <!-- no translation found for bluetooth_connect (6123567524009555372) -->
-    <skip />
-    <!-- no translation found for bluetooth_unpair (6786377316984999718) -->
-    <skip />
-    <!-- no translation found for bluetooth_pair (6433088623778842494) -->
-    <skip />
-    <string name="progress_scanning">"Buscando"</string>
-    <!-- no translation found for bluetooth_notif_ticker (6269529534945974964) -->
-    <skip />
-    <!-- no translation found for bluetooth_notif_title (3790273649365187417) -->
-    <skip />
-    <!-- no translation found for bluetooth_notif_message (3713615470961259613) -->
-    <skip />
-    <string name="date_and_time">"Fecha y hora"</string>
-    <!-- no translation found for date_time_12_hour_sample (3346099183513673921) -->
-    <skip />
-    <!-- no translation found for date_time_24_hour_sample (2930431568836213699) -->
-    <skip />
-    <string name="choose_timezone">"Seleccionar zona horaria"</string>
-    <string name="display_preview_label">"Vista previa:"</string>
-    <string name="display_font_size_label">"Tamaño de fuente:"</string>
-    <string name="intent_sender_data_label">"Datos:"</string>
-    <string name="intent_sender_sendbroadcast_text">"Enviar emisión"</string>
-    <string name="intent_sender_action_label">"Acción:"</string>
-    <string name="intent_sender_startactivity_text">"Iniciar actividad"</string>
-    <string name="intent_sender_resource_label">"Recurso:"</string>
-    <string name="intent_sender_account_label">"Cuenta:"</string>
-    <string name="keyguard_pw_mod_text">"Seleccionar patrón de bloqueo"</string>
-    <string name="keyguard_pin_mod_text">"Cambiar PIN"</string>
-    <string name="keyguard_label">"Protección de clave"</string>
-    <string name="keyguard_sim_pin_label">"PIN de SIM"</string>
-    <string name="keyguard_password_old_password_error_text">"¡La contraseña anterior que ha introducido no es correcta! Por favor, inténtelo de nuevo"</string>
-    <string name="keyguard_password_button_text">"Aceptar"</string>
-    <string name="keyguard_password_confirm_new_label">"Confirmar nueva contraseña:"</string>
-    <string name="keyguard_password_new_label">"Contraseña nueva:"</string>
-    <string name="keyguard_password_old_label">"Contraseña anterior:"</string>
-    <string name="keyguard_password_mismatch_error_text">"¡Las dos contraseñas no coinciden! Vuelva a introducirlas"</string>
-    <string name="proxy_clear_text">"Borrar"</string>
-    <string name="proxy_port_label">"Puerto"</string>
-    <string name="proxy_defaultView_text">"Restaurar predeterminados"</string>
-    <string name="proxy_action_text">"Guardar"</string>
-    <string name="proxy_hostname_label">"Nombre de host"</string>
-    <string name="proxy_error">"¡Atención!"</string>
-    <string name="proxy_error_dismiss">"Aceptar"</string>
-    <string name="proxy_error_invalid_host">"El nombre de host que ha introducido no es válido"</string>
-    <string name="proxy_error_empty_port">"Debe completar el campo Puerto"</string>
-    <string name="proxy_error_empty_host_set_port">"El campo Puerto debe estar vacío si el campo Host está vacío"</string>
-    <string name="proxy_error_invalid_port">"El nombre de puerto que ha introducido no es válido"</string>
-    <string name="radio_info_signal_location_label">"Ubicación:"</string>
-    <string name="radio_info_neighboring_location_label">"CID cercano:"</string>
-    <string name="radio_info_data_attempts_label">"Intentos de datos:"</string>
-    <string name="radio_info_imsi_label">"IMSI:"</string>
-    <string name="radio_info_gprs_service_label">"Servicio GPRS:"</string>
-    <string name="radio_info_roaming_label">"Itinerancia:"</string>
-    <string name="radio_info_imei_label">"IMEI:"</string>
-    <string name="radio_info_call_redirect_label">"Redirección de llamada:"</string>
-    <string name="radio_info_ppp_resets_label">"Número de restablecimientos PPP desde el arranque:"</string>
-    <string name="radio_info_gsm_disconnects_label">"Desconexiones GSM:"</string>
-    <string name="radio_info_current_network_label">"Red actual:"</string>
-    <string name="radio_info_data_successes_label">"Datos enviados correctamente:"</string>
-    <string name="radio_info_ppp_received_label">"PPP recibido:"</string>
-    <string name="radio_info_gsm_service_label">"Servicio GSM:"</string>
-    <string name="radio_info_signal_strength_label">"Intensidad de señal:"</string>
-    <string name="radio_info_call_status_label">"Estado de llamada:"</string>
-    <string name="radio_info_ppp_sent_label">"PPP enviados:"</string>
-    <string name="radio_info_radio_resets_label">"Restablecimientos de radio:"</string>
-    <string name="radio_info_message_waiting_label">"Mensaje esperando:"</string>
-    <string name="radio_info_phone_number_label">"Número de teléfono:"</string>
-    <string name="radio_info_band_mode_label">"Seleccionar banda de radio"</string>
-    <string name="radio_info_network_type_label">"Tipo de red:"</string>
-    <string name="radio_info_set_perferred_label">"Establecer tipo de red preferido:"</string>
-    <!-- no translation found for radio_info_ping_ipaddr (7229811664688502621) -->
-    <skip />
-    <!-- no translation found for radio_info_ping_hostname (7817617877155199848) -->
-    <skip />
-    <!-- no translation found for radio_info_http_client_test (5100483824350561339) -->
-    <skip />
-    <!-- no translation found for radio_info_toggle_ciph_label (2705975697585878388) -->
-    <skip />
-    <!-- no translation found for ping_test_label (99396772665008247) -->
-    <skip />
-    <!-- no translation found for radio_info_smsc_label (6577522217730406517) -->
-    <skip />
-    <!-- no translation found for radio_info_smsc_update_label (6471155265532972448) -->
-    <skip />
-    <!-- no translation found for radio_info_smsc_refresh_label (4334057389927982364) -->
-    <skip />
-    <string name="band_mode_title">"Establecer banda GSM/UMTS"</string>
-    <string name="band_mode_loading">"Cargando lista de bandas…"</string>
-    <string name="band_mode_set">"Establecer"</string>
-    <string name="band_mode_failed">"Error"</string>
-    <string name="band_mode_succeeded">"Realizado con éxito"</string>
-    <string name="ringer_volume_ringer_mode_label">"Modo de timbre"</string>
-    <string name="ringer_volume_screen_increasing_text">"Timbre creciente"</string>
-    <string name="ringer_volume_ringtone_label">"Tono de timbre"</string>
-    <string name="ringer_volume_instructions">"Usar los botones de volumen para ajustar el volumen del timbre"</string>
-    <string name="sdcard_changes_instructions">"Los cambios se aplicarán cuando se vuelva a conectar el cable USB"</string>
-    <string name="sdcard_settings_screen_mass_storage_text">"Habilitar almacenamiento masivo USB"</string>
-    <string name="sdcard_settings_total_bytes_label">"Bytes totales:"</string>
-    <string name="sdcard_settings_not_present_status">"Ninguna tarjeta SD"</string>
-    <string name="sdcard_settings_available_bytes_label">"Bytes disponibles:"</string>
-    <string name="sdcard_settings_mass_storage_status">"La tarjeta SD se está utilizando como dispositivo de almacenamiento masivo"</string>
-    <string name="sdcard_settings_unmounted_status">"Ahora es seguro extraer la tarjeta SD"</string>
-    <string name="sdcard_settings_bad_removal_status">"¡La tarjeta SD se ha extraído mientras seguía en uso!"</string>
-    <string name="sdcard_settings_used_bytes_label">"Bytes usados:"</string>
-    <string name="sdcard_settings_scanning_status">"Buscando medios en tarjeta SD…"</string>
-    <string name="sdcard_settings_read_only_status">"Tarjeta SD montada de sólo lectura"</string>
-    <string name="sdcard_removal_alert_title">"Extracción de tarjeta SD no segura"</string>
-    <string name="sdcard_unmountable_alert_title">"Tarjeta SD no legible"</string>
-    <string name="telephony_user_label">"Usuario:"</string>
-    <string name="telephony_server_label">"Servidor:"</string>
-    <string name="telephony_name_label">"Nombre:"</string>
-    <string name="telephony_mmsc_label">"MMSC:"</string>
-    <string name="telephony_apn_label">"APN:"</string>
-    <string name="telephony_mcc_label">"MCC:"</string>
-    <string name="telephony_port_label">"Puerto:"</string>
-    <string name="telephony_password_label">"Contraseña:"</string>
-    <string name="telephony_proxy_label">"Proxy:"</string>
-    <string name="telephony_mnc_label">"MNC:"</string>
-    <string name="telephony_mmsproxy_label">"Proxy MMS:"</string>
-    <string name="telephony_mmsport_label">"Puerto MMS:"</string>
-    <string name="next_label">"Siguiente"</string>
-    <string name="language_picker_title">"Idioma"</string>
-    <!-- no translation found for select_your_language (9081963472187973531) -->
-    <skip />
-    <string name="activity_picker_label">"Seleccionar actividad"</string>
-    <string name="device_info_label">"Información del dispositivo"</string>
-    <string name="battery_info_label">"Información de batería"</string>
-    <string name="display_label">"Pantalla"</string>
-    <string name="phone_info_label">"Información del teléfono"</string>
-    <string name="sd_card_settings_label">"Tarjeta SD"</string>
-    <string name="proxy_settings_label">"Configuración de proxy"</string>
-    <string name="cancel">"Cancelar"</string>
-    <string name="settings_label">"Configuración"</string>
-    <string name="airplane_mode">"Modo avión"</string>
-    <!-- no translation found for airplane_mode_summary (3500557633417506553) -->
-    <skip />
-    <!-- no translation found for airplane_mode_turning_on (1243134862683209663) -->
-    <skip />
-    <!-- no translation found for airplane_mode_turning_off (2291183932542256190) -->
-    <skip />
-    <!-- no translation found for radio_controls_title (4981652151494753702) -->
-    <skip />
-    <!-- no translation found for radio_controls_summary (9105526969569292926) -->
-    <skip />
-    <string name="date_and_time_settings_title">"Fecha y hora"</string>
-    <!-- no translation found for date_and_time_settings_summary (3489093199543794055) -->
-    <skip />
-    <string name="date_time_auto">"Automát."</string>
-    <string name="date_time_auto_summaryOn">"Usar valores suministrados por la red"</string>
-    <string name="date_time_auto_summaryOff">"Usar valores seleccionados por el usuario"</string>
-    <string name="date_time_24hour">"Formato 24 horas"</string>
-    <string name="date_time_set_time">"Establecer hora"</string>
-    <string name="date_time_set_timezone">"Seleccionar zona horaria"</string>
-    <string name="date_time_set_date">"Establecer fecha"</string>
-    <string name="date_time_date_format">"Establecer formato de fecha"</string>
-    <!-- no translation found for zone_list_menu_sort_alphabetically (8983103881342552870) -->
-    <skip />
-    <!-- no translation found for zone_list_menu_sort_by_timezone (7025442915093990469) -->
-    <skip />
-    <!-- no translation found for security_settings_title (969550777120624897) -->
-    <skip />
-    <!-- no translation found for security_settings_summary (3202445632951595923) -->
-    <skip />
-    <!-- no translation found for security_passwords_title (4466520735598079063) -->
-    <skip />
-    <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
-    <!-- no translation found for bluetooth_quick_toggle_summary (2292894901949724405) -->
-    <skip />
-    <!-- no translation found for bluetooth_settings (1545097653816106117) -->
-    <skip />
-    <string name="bluetooth_settings_title">"Configuración de Bluetooth"</string>
-    <!-- no translation found for bluetooth_settings_summary (1419697742707330821) -->
-    <skip />
-    <string name="bluetooth_pin_entry">"Entrada de PIN Bluetooth"</string>
-    <string name="bluetooth_device_info">"Información de dispositivo Bluetooth"</string>
-    <string name="bluetooth_pairing_msg">"Emparejando…"</string>
-    <string name="bluetooth_enter_pin_msg">"Introducir PIN para"</string>
-    <string name="bluetooth_new_data">"Introducir nuevos datos"</string>
-    <string name="bluetooth_new_data_confirm">"Aceptar"</string>
-    <string name="bluetooth_new_data_cancel">"Cancelar"</string>
-    <string name="bluetooth_scan_for_new_devices">"Buscando nuevos dispositivos…"</string>
-    <string name="bluetooth_discoverability_panel_title">"Mostrarme…"</string>
-    <string name="bluetooth_discoverable">"Detectable y conectable"</string>
-    <string name="bluetooth_connectable">"Sólo conectable"</string>
-    <string name="bluetooth_neither">"Ni detectable ni conectable"</string>
-    <!-- no translation found for bluetooth_preference_scan_title (5457824526570506576) -->
-    <skip />
-    <!-- no translation found for bluetooth_preference_scan_summary (4169248439102381141) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_context_connect (1360133741981139570) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_context_disconnect (3848550418295778426) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_context_pair_connect (3526057462723016574) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_context_unpair (1842004154350000288) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_context_disconnect_unpair (302606151874724466) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_context_connect_advanced (5004355397163127842) -->
-    <skip />
-    <!-- no translation found for bluetooth_connect_specific_profiles_title (8557599374974072579) -->
-    <skip />
-    <!-- no translation found for bluetooth_profile_a2dp (6848174297822591204) -->
-    <skip />
-    <!-- no translation found for bluetooth_profile_headset (8660680578951214915) -->
-    <skip />
-    <string name="wifi">"Wi-Fi"</string>
-    <!-- no translation found for wifi_quick_toggle_title (4404851801229148146) -->
-    <skip />
-    <!-- no translation found for wifi_quick_toggle_summary (5254705029759236850) -->
-    <skip />
-    <string name="wifi_settings">"Configuración de Wi-Fi"</string>
-    <!-- no translation found for wifi_settings_category (610287013958209636) -->
-    <skip />
-    <!-- no translation found for wifi_settings_summary (8789964612748859011) -->
-    <skip />
-    <string name="forget_network">"Olvidar"</string>
-    <!-- no translation found for wifi_status (4374358089273446404) -->
-    <skip />
-    <!-- no translation found for wifi_link_speed (8766462457818203791) -->
-    <skip />
-    <!-- no translation found for wifi_signal_3 (1264702582845283580) -->
-    <skip />
-    <!-- no translation found for wifi_signal_2 (3765197678751351272) -->
-    <skip />
-    <!-- no translation found for wifi_signal_1 (3469786868912545422) -->
-    <skip />
-    <!-- no translation found for wifi_signal_0 (7285670709111185231) -->
-    <skip />
-    <string name="security">"Seguridad"</string>
-    <!-- no translation found for wifi_security_open (6529463996240023139) -->
-    <skip />
-    <!-- no translation found for wifi_security_wep (8543279149057388909) -->
-    <skip />
-    <!-- no translation found for wifi_security_wpa (7229647924366572707) -->
-    <skip />
-    <!-- no translation found for wifi_security_wpa2 (641020427516679969) -->
-    <skip />
-    <!-- no translation found for wifi_security_unknown (7700764937580224930) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_open (7105261201983314526) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wep (2018232984976185738) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa (7240649761750328761) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa2 (5470387821577814216) -->
-    <skip />
-    <string name="ip_address">"Dirección IP"</string>
-    <string name="signal">"Intensidad de señal"</string>
-    <!-- no translation found for wifi_starting (380585178092358776) -->
-    <skip />
-    <!-- no translation found for wifi_stopping (1130828572786743854) -->
-    <skip />
-    <!-- no translation found for wifi_error (7223451684597210919) -->
-    <skip />
-    <string name="error_starting">"Error al iniciar Wi-Fi"</string>
-    <string name="error_stopping">"Error al detener Wi-Fi"</string>
-    <string name="error_scanning">"Error al buscar redes"</string>
-    <string name="error_connecting">"Error al conectar con la red"</string>
-    <string name="error_saving">"Error al guardar red"</string>
-    <string name="connect">"Conectar"</string>
-    <string name="connect_to_blank">"Conectar a %1$s"</string>
-    <string name="please_type_passphrase">"Introduzca su contraseña inalámbrica"</string>
-    <!-- no translation found for please_type_hex_key (3792966437690051423) -->
-    <skip />
-    <!-- no translation found for wifi_show_password (2142204324333077532) -->
-    <skip />
-    <string name="scan_wifi">"Examinar"</string>
-    <string name="summary_not_in_range">"No en intervalo"</string>
-    <string name="summary_remembered">"Recordado"</string>
-    <!-- no translation found for summary_connection_failed (5466501123715222542) -->
-    <skip />
-    <string name="wifi_access_points">"Redes"</string>
-    <!-- no translation found for wifi_type_ssid (4389276980911820577) -->
-    <skip />
-    <!-- no translation found for wifi_security (8115513846744543151) -->
-    <skip />
-    <!-- no translation found for wifi_save_config (1041957548332322297) -->
-    <skip />
-    <!-- no translation found for wifi_password_unchanged (5583782979192657008) -->
-    <skip />
-    <!-- no translation found for wifi_add_other_network (914072465709281633) -->
-    <skip />
-    <!-- no translation found for wifi_notify_open_networks (3091942233631075516) -->
-    <skip />
-    <!-- no translation found for wifi_notify_open_networks_summary (1793737931132127488) -->
-    <skip />
-    <!-- no translation found for wifi_password_incorrect_error (8656138222468900361) -->
-    <skip />
-    <!-- no translation found for wifi_generic_connection_error (4414845075108763948) -->
-    <skip />
-    <!-- no translation found for wifi_menu_advanced (7729886219986221918) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings_titlebar (6646153875184353089) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings_menu_save (5525488681356054899) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings_menu_cancel (4123436217014637229) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings_invalid_ip (1648124374575025870) -->
-    <skip />
-    <!-- no translation found for wifi_use_static_ip (4076793026334955338) -->
-    <skip />
-    <!-- no translation found for wifi_ip_address (6067958502872259392) -->
-    <skip />
-    <!-- no translation found for wifi_dns1 (7502077213876989613) -->
-    <skip />
-    <!-- no translation found for wifi_dns2 (3296825469895827273) -->
-    <skip />
-    <!-- no translation found for wifi_gateway (393330487055540831) -->
-    <skip />
-    <!-- no translation found for wifi_netmask (6024777305439519433) -->
-    <skip />
-    <!-- no translation found for wifi_context_menu_connect (3348366738100644008) -->
-    <skip />
-    <!-- no translation found for wifi_context_menu_forget (5844111744505938081) -->
-    <skip />
-    <!-- no translation found for wifi_context_menu_change_password (7074463790535015442) -->
-    <skip />
-    <!-- no translation found for wifi_advanced_titlebar (7352048185262676955) -->
-    <skip />
-    <!-- no translation found for wifi_setting_num_channels_title (4302664253747096207) -->
-    <skip />
-    <!-- no translation found for wifi_setting_num_channels_summary (5137058932628594680) -->
-    <skip />
-    <!-- no translation found for wifi_setting_num_channels_error (581404310349899492) -->
-    <skip />
-    <!-- no translation found for wifi_setting_num_channels_channel_phrase (8341967925173918983) -->
-    <skip />
-    <string name="fragment_status_scanning">"Buscando"</string>
-    <string name="fragment_status_connecting">"Conectando a %1$s"</string>
-    <string name="fragment_status_authenticating">"Autenticando con %1$s"</string>
-    <string name="fragment_status_obtaining_ip">"Obteniendo dirección IP de %1$s"</string>
-    <string name="fragment_status_connected">"Conectado a %1$s"</string>
-    <string name="fragment_status_disconnecting">"Desconectando de %1$s"</string>
-    <string name="fragment_status_disconnected">"Desconectado"</string>
-    <string name="fragment_status_failed">"Error"</string>
-    <string name="status_scanning">"Buscando"</string>
-    <string name="status_connecting">"Conectando"</string>
-    <string name="status_authenticating">"Autenticando"</string>
-    <string name="status_obtaining_ip">"Obteniendo dirección IP"</string>
-    <string name="status_connected">"Conectado"</string>
-    <string name="status_disconnecting">"Desconectando"</string>
-    <string name="status_disconnected">"Desconectado"</string>
-    <string name="status_failed">"Error"</string>
-    <!-- no translation found for sound_and_display_settings (4749118288236939460) -->
-    <skip />
-    <!-- no translation found for sound_settings (2706184235211157339) -->
-    <skip />
-    <!-- no translation found for sound_and_display_settings_summary (3672623202659031178) -->
-    <skip />
-    <string name="silent_mode_title">"Silencio"</string>
-    <!-- no translation found for silent_mode_summary (6135093989634963053) -->
-    <skip />
-    <string name="ringtone_title">"Tono de timbre del teléfono"</string>
-    <!-- no translation found for ringtone_summary (1766080371183553822) -->
-    <skip />
-    <string name="ring_volume_title">"Volumen de timbre"</string>
-    <!-- no translation found for ring_volume_summary (8107485240454889544) -->
-    <skip />
-    <!-- no translation found for vibrate_title (4376574310180696114) -->
-    <skip />
-    <!-- no translation found for vibrate_summary (6788068739601216797) -->
-    <skip />
-    <string name="notification_sound_title">"Tonos de timbre de notificación"</string>
-    <!-- no translation found for notification_sound_summary (7617168477811163700) -->
-    <skip />
-    <string name="notification_sound_dialog_title">"Seleccionar tonos de timbre de notificación"</string>
-    <!-- no translation found for media_volume_title (1693540506432790482) -->
-    <skip />
-    <!-- no translation found for media_volume_summary (7399719776785079493) -->
-    <skip />
-    <!-- no translation found for dtmf_tone_enable_title (5173416183471867551) -->
-    <skip />
-    <!-- no translation found for dtmf_tone_enable_summary_on (7206798183944836534) -->
-    <skip />
-    <!-- no translation found for dtmf_tone_enable_summary_off (1555390648905350809) -->
-    <skip />
-    <!-- no translation found for sound_effects_enable_title (1955885794556255214) -->
-    <skip />
-    <!-- no translation found for sound_effects_enable_summary_on (1491009278452582375) -->
-    <skip />
-    <!-- no translation found for sound_effects_enable_summary_off (1932117674347216086) -->
-    <skip />
-    <string name="sync_settings">"Sincronización"</string>
-    <!-- no translation found for sync_settings_summary (2105151329390814783) -->
-    <skip />
-    <!-- no translation found for sync_too_many_deletes (5404332736593108449) -->
-    <skip />
-    <!-- no translation found for sync_automatically (1757054007777364379) -->
-    <skip />
-    <string name="sync_enabled">"Sincronización con servidor Google habilitada"</string>
-    <string name="sync_disabled">"Desactivado"</string>
-    <string name="sync_menu_sync_now">"Sincronizar ahora"</string>
-    <string name="sync_menu_sync_cancel">"Cancelar sincronización"</string>
-    <string name="sync_gmail">"Gmail"</string>
-    <string name="sync_calendar">"Calendario"</string>
-    <string name="sync_contacts">"Contactos"</string>
-    <!-- no translation found for sync_too_many_deletes_desc (4152554451720380120) -->
-    <skip />
-    <!-- no translation found for sync_really_delete (8529530859370540061) -->
-    <skip />
-    <!-- no translation found for sync_undo_deletes (5506677219430968015) -->
-    <skip />
-    <!-- no translation found for sync_do_nothing (8346666920786786758) -->
-    <skip />
-    <!-- no translation found for sync_is_failing (427555999473172925) -->
-    <skip />
-    <!-- no translation found for sync_plug (7544937220884084907) -->
-    <skip />
-    <string name="display_settings">"Pantalla"</string>
-    <!-- no translation found for animations_title (8735876378664711924) -->
-    <skip />
-    <!-- no translation found for animations_summary_on (4910047473170373768) -->
-    <skip />
-    <!-- no translation found for animations_summary_off (7454248311417075336) -->
-    <skip />
-    <string name="brightness">"Brillo"</string>
-    <!-- no translation found for screen_timeout (8939204183998677539) -->
-    <skip />
-    <string name="dim_screen">"Oscurecer pantalla"</string>
-    <string name="sim_lock_settings">"Bloqueo de tarjeta SIM"</string>
-    <!-- no translation found for sim_lock_settings_category (5039441655358781230) -->
-    <skip />
-    <string name="sim_lock_settings_title">"Configuración de bloqueo de SIM"</string>
-    <string name="sim_pin_toggle">"Bloqueo de tarjeta SIM"</string>
-    <string name="sim_lock_on">"Bloqueo de tarjeta SIM activado"</string>
-    <string name="sim_lock_off">"Bloqueo de tarjeta SIM desactivado"</string>
-    <string name="sim_pin_change">"Cambiar código PIN"</string>
-    <string name="sim_enter_pin">"Introducir PIN de SIM"</string>
-    <string name="sim_enable_sim_lock">"Habilitar bloqueo de tarjeta SIM"</string>
-    <string name="sim_disable_sim_lock">"Deshabilitar bloqueo de tarjeta SIM"</string>
-    <string name="sim_enter_old">"Introducir PIN anterior"</string>
-    <string name="sim_enter_new">"Introducir nuevo PIN"</string>
-    <string name="sim_reenter_new">"Vuelva a introducir el nuevo PIN"</string>
-    <string name="sim_change_pin">"Cambiar PIN de SIM"</string>
-    <string name="sim_bad_pin">"Advertencia: PIN incorrecto"</string>
-    <string name="sim_pins_dont_match">"Advertencia: Los PIN no coinciden"</string>
-    <string name="sim_change_failed">"Fallo al cambiar PIN"\n"PIN posiblemente incorrecto"</string>
-    <string name="sim_change_succeeded">"PIN de SIM cambiado correctamente"</string>
-    <string name="sim_lock_failed">"Fallo al cambiar estado de bloqueo de la tarjeta SIM"\n"PIN posiblemente incorrecto"</string>
-    <string name="sim_enter_ok">"Aceptar"</string>
-    <string name="sim_enter_cancel">"Cancelar"</string>
-    <string name="device_info_settings">"Información del dispositivo"</string>
-    <!-- no translation found for system_update_settings_list_item_title (6730200310196695815) -->
-    <skip />
-    <!-- no translation found for system_update_settings_list_item_summary (6739352515982816664) -->
-    <skip />
-    <string name="firmware_version">"Versión de firmware"</string>
-    <!-- no translation found for model_number (4107796374489189882) -->
-    <skip />
-    <string name="baseband_version">"Versión de banda básica"</string>
-    <!-- no translation found for kernel_version (55378504731737055) -->
-    <skip />
-    <!-- no translation found for build_number (1198654854394859525) -->
-    <skip />
-    <!-- no translation found for device_info_not_available (6218382614449625943) -->
-    <skip />
-    <!-- no translation found for device_status_activity_title (7855799759928692423) -->
-    <skip />
-    <string name="device_status">"Estado"</string>
-    <string name="device_status_summary">"IMEI, número de teléfono, señal, etc."</string>
-    <!-- no translation found for storage_settings_title (7861753874184164833) -->
-    <skip />
-    <!-- no translation found for storage_settings_summary (1416818376253802300) -->
-    <skip />
-    <string name="status_number">"Número de teléfono"</string>
-    <string name="status_network_type">"Tipo de red"</string>
-    <string name="status_data_state">"Acceso a los datos"</string>
-    <string name="status_service_state">"Estado del servicio"</string>
-    <string name="status_signal_strength">"Intensidad de señal"</string>
-    <string name="status_roaming">"Itinerancia"</string>
-    <string name="status_operator">"Red"</string>
-    <!-- no translation found for status_wifi_mac_address (6992831729694423293) -->
-    <skip />
-    <!-- no translation found for status_bt_address (504373592762785867) -->
-    <skip />
-    <!-- no translation found for status_unavailable (6051510065892966154) -->
-    <skip />
-    <string name="status_up_time">"Tiempo de funcionamiento"</string>
-    <string name="status_awake_time">"Tiempo de actividad"</string>
-    <!-- no translation found for internal_memory (7561409402817962159) -->
-    <skip />
-    <!-- no translation found for sd_memory (1795406535114313767) -->
-    <skip />
-    <!-- no translation found for memory_available (2899158225295363424) -->
-    <skip />
-    <!-- no translation found for memory_size (427803224818498885) -->
-    <skip />
-    <!-- no translation found for sd_eject (5921913949386442101) -->
-    <skip />
-    <string name="sd_unavailable">"No disponible"</string>
-    <string name="read_only">" (Sólo lectura)"</string>
-    <!-- no translation found for battery_status_title (4908729478929871241) -->
-    <skip />
-    <!-- no translation found for battery_level_title (7696801820825704716) -->
-    <skip />
-    <string name="apn_settings">"APN"</string>
-    <string name="apn_edit">"Editar punto de acceso"</string>
-    <string name="apn_not_set">"&lt;No establecido&gt;"</string>
-    <string name="apn_name">"Nombre"</string>
-    <string name="apn_apn">"APN"</string>
-    <string name="apn_http_proxy">"Proxy"</string>
-    <string name="apn_http_port">"Puerto"</string>
-    <string name="apn_user">"Nombre de usuario"</string>
-    <string name="apn_password">"Contraseña"</string>
-    <string name="apn_server">"Servidor"</string>
-    <string name="apn_mmsc">"MMSC"</string>
-    <string name="apn_mms_proxy">"Proxy MMS"</string>
-    <string name="apn_mms_port">"Puerto MMS"</string>
-    <string name="apn_mcc">"MCC"</string>
-    <string name="apn_mnc">"MNC"</string>
-    <!-- no translation found for apn_type (2506383481268652319) -->
-    <skip />
-    <string name="menu_delete">"Eliminar APN"</string>
-    <string name="menu_new">"Nueva APN"</string>
-    <string name="menu_save">"Guardar"</string>
-    <string name="menu_cancel">"Rechazar"</string>
-    <string name="error_title">"Datos no válidos"</string>
-    <string name="error_name_empty">"El campo Nombre no puede estar vacío"</string>
-    <string name="error_apn_empty">"El Nombre de punto de acceso no puede estar vacío"</string>
-    <string name="error_mcc_not3">"El campo MCC debe tener 3 dígitos"</string>
-    <string name="error_mnc_not23">"El campo MCC debe tener 2 ó 3 dígitos"</string>
-    <string name="master_clear_title">"Borrado maestro"</string>
-    <!-- no translation found for master_clear_summary (2468534382451112879) -->
-    <skip />
-    <string name="master_clear_desc">"Restablece el dispositivo al estado inicial de fábrica, borrando todos los datos y aplicaciones descargadas"</string>
-    <string name="master_clear_button_text">"Restablecer dispositivo"</string>
-    <string name="master_clear_final_desc">"¿Restablecer dispositivo borrando todos sus datos y aplicaciones? ¡La acción no se puede deshacer!"</string>
-    <string name="master_clear_final_button_text">"Borrar todo"</string>
-    <string name="master_clear_gesture_prompt">"Trace su patrón de bloqueo"</string>
-    <string name="master_clear_gesture_explanation">"Debe trazar su patrón de bloqueo para confirmar el restablecimiento del dispositivo"</string>
-    <string name="master_clear_failed">"No se ha realizado ningún restablecimiento porque el servicio System Clear no está disponible"</string>
-    <string name="call_settings_title">"Configuración de llamada"</string>
-    <!-- no translation found for call_settings_summary (3446216896482844237) -->
-    <skip />
-    <string name="network_settings_title">"Configuración de red"</string>
-    <!-- no translation found for network_settings_summary (8031949240036716110) -->
-    <skip />
-    <!-- no translation found for location_title (4501749309437121375) -->
-    <skip />
-    <string name="location_network_based">"Basado en red"</string>
-    <!-- no translation found for location_networks_disabled (7048471014395968941) -->
-    <skip />
-    <string name="location_neighborhood_level">"Precisión hasta el nivel de barrio"</string>
-    <string name="location_gps">"Basado en GPS"</string>
-    <string name="location_street_level">"Precisión hasta el nivel de calle"</string>
-    <!-- no translation found for location_gps_disabled (4004885356658024277) -->
-    <skip />
-    <!-- no translation found for about_settings (1468182090257585152) -->
-    <skip />
-    <!-- no translation found for about_settings_summary (7669309646592260587) -->
-    <skip />
-    <!-- no translation found for legal_information (6712607847710471677) -->
-    <skip />
-    <!-- no translation found for contributors_title (4798193298012318879) -->
-    <skip />
-    <!-- no translation found for copyright_title (2179228277436615247) -->
-    <skip />
-    <!-- no translation found for license_title (819526735187376873) -->
-    <skip />
-    <!-- no translation found for terms_title (7807601861320706623) -->
-    <skip />
-    <!-- no translation found for settings_license_activity_title (7912723098716795094) -->
-    <skip />
-    <!-- no translation found for settings_license_activity_unavailable (2081311778550755077) -->
-    <skip />
-    <!-- no translation found for settings_license_activity_loading (1663818560123999889) -->
-    <skip />
-    <string name="lock_settings_title">"Gesto de bloqueo"</string>
-    <string name="lockpattern_change_lock_pattern_label">"Cambiar patrón de bloqueo"</string>
-    <string name="lockpattern_need_to_unlock">"Confirmar patrón guardado:"</string>
-    <string name="lockpattern_need_to_unlock_wrong">"¡Incorrecto! Inténtelo de nuevo:"</string>
-    <string name="lockpattern_recording_intro_header">"Trace un patrón que desee usar como bloqueo:"</string>
-    <string name="lockpattern_recording_intro_footer">"Pulse Menú para obtener ayuda"</string>
-    <string name="lockpattern_recording_inprogress">"Suelte el dedo cuando haya terminado"</string>
-    <!-- no translation found for lockpattern_recording_incorrect_too_short (8234374450664107990) -->
-    <skip />
-    <string name="lockpattern_pattern_entered_header">"Ha seleccionado:"</string>
-    <!-- no translation found for lockpattern_need_to_confirm (6414172006294337771) -->
-    <skip />
-    <string name="lockpattern_pattern_confirmed_header">"Su nuevo patrón de bloqueo:"</string>
-    <string name="lockpattern_confirm_button_text">"Confirmar"</string>
-    <string name="lockpattern_restart_button_text">"Reinicio"</string>
-    <!-- no translation found for lockpattern_retry_button_text (7695474740059017745) -->
-    <skip />
-    <!-- no translation found for lockpattern_continue_button_text (1077275957953266837) -->
-    <skip />
-    <string name="lockpattern_settings_title">"Gesto de bloqueo"</string>
-    <string name="lockpattern_settings_enable_title">"Gesto de bloqueo"</string>
-    <string name="lockpattern_settings_enable_summary">"Se necesita gesto para bloquear"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title">"Usar patrón visible"</string>
-    <string name="lockpattern_settings_choose_lock_pattern">"Seleccionar gesto de bloqueo"</string>
-    <string name="lockpattern_settings_change_lock_pattern">"Cambiar gesto de bloqueo"</string>
-    <string name="lockpattern_settings_help_how_to_record">"Cómo grabar un patrón de bloqueo"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header">"Demasiados intentos de confirmación incorrectos"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer">"Inténtelo de nuevo en <xliff:g id="NUMBER">%d</xliff:g> segundos"</string>
-    <!-- no translation found for skip_button_label (4850708311344393218) -->
-    <skip />
-    <!-- no translation found for next_button_label (3149701380025478958) -->
-    <skip />
-    <!-- no translation found for lock_title (999106562425756837) -->
-    <skip />
-    <!-- no translation found for lock_intro_message (2382351248538397170) -->
-    <skip />
-    <!-- no translation found for lock_example_title (6261868148302088973) -->
-    <skip />
-    <!-- no translation found for lock_example_message (2583534765034914458) -->
-    <skip />
-    <!-- no translation found for manageapplications_settings_title (3359899792647354589) -->
-    <skip />
-    <!-- no translation found for applications_settings (6104314134883460574) -->
-    <skip />
-    <!-- no translation found for applications_settings_summary (7666960391957493763) -->
-    <skip />
-    <!-- no translation found for applications_settings_header (6167136604757235210) -->
-    <skip />
-    <!-- no translation found for install_applications (8586540661161378543) -->
-    <skip />
-    <!-- no translation found for install_unknown_applications (8694019339326383901) -->
-    <skip />
-    <!-- no translation found for install_all_warning (5826871395153503952) -->
-    <skip />
-    <!-- no translation found for manage_applications_title (8288310040777485758) -->
-    <skip />
-    <!-- no translation found for application_info_label (605192869687093760) -->
-    <skip />
-    <!-- no translation found for storage_label (8765276782501761971) -->
-    <skip />
-    <!-- no translation found for auto_launch_label (3546876666453498673) -->
-    <skip />
-    <!-- no translation found for permissions_label (3244346920180368862) -->
-    <skip />
-    <!-- no translation found for total_size_label (5016115699600749568) -->
-    <skip />
-    <!-- no translation found for application_size_label (5378963933449396413) -->
-    <skip />
-    <!-- no translation found for data_size_label (6038126657652457179) -->
-    <skip />
-    <!-- no translation found for uninstall_text (2322009518449651787) -->
-    <skip />
-    <!-- no translation found for clear_user_data_text (3586758620250813061) -->
-    <skip />
-    <!-- no translation found for auto_launch_enable_text (8228619838865933982) -->
-    <skip />
-    <!-- no translation found for auto_launch_disable_text (4696687016762486484) -->
-    <skip />
-    <!-- no translation found for clear_activities (2399981667625036009) -->
-    <skip />
-    <!-- no translation found for unknown (7966307317466394761) -->
-    <skip />
-    <!-- no translation found for sort_order_alpha (210746743398042077) -->
-    <skip />
-    <!-- no translation found for sort_order_size (2716777274377923612) -->
-    <skip />
-    <!-- no translation found for manage_space_text (3118726017144542336) -->
-    <skip />
-    <!-- no translation found for filter_apps_all (5819127882791374920) -->
-    <skip />
-    <!-- no translation found for filter_apps_third_party (8693065498520334174) -->
-    <skip />
-    <!-- no translation found for filter_apps_running (2019159142681656258) -->
-    <skip />
-    <!-- no translation found for loading (5170696093820794830) -->
-    <skip />
-    <!-- no translation found for recompute_size (8376294373548662083) -->
-    <skip />
-    <!-- no translation found for clear_data_dlg_title (2115093619616088799) -->
-    <skip />
-    <!-- no translation found for clear_data_dlg_text (3004273956481932846) -->
-    <skip />
-    <!-- no translation found for dlg_ok (2225130755859653348) -->
-    <skip />
-    <!-- no translation found for dlg_cancel (8597172015374919396) -->
-    <skip />
-    <!-- no translation found for app_not_found_dlg_title (6649900521951617898) -->
-    <skip />
-    <!-- no translation found for app_not_found_dlg_text (6893475426667174751) -->
-    <skip />
-    <!-- no translation found for clear_data_failed (3040984234884359027) -->
-    <skip />
-    <!-- no translation found for security_settings_desc (5898339748632998613) -->
-    <skip />
-    <!-- no translation found for default_app_desc (3475613003133497043) -->
-    <skip />
-    <!-- no translation found for computing_size (7350089935999085554) -->
-    <skip />
-    <!-- no translation found for invalid_size_value (3054945647487201471) -->
-    <skip />
-    <!-- no translation found for language_settings (7247557040404006341) -->
-    <skip />
-    <!-- no translation found for language_settings_summary (721948806318958691) -->
-    <skip />
-    <!-- no translation found for language_category (6646529166552376418) -->
-    <skip />
-    <!-- no translation found for text_category (3133311779500246731) -->
-    <skip />
-    <!-- no translation found for phone_language (4084332836028530631) -->
-    <skip />
-    <!-- no translation found for auto_replace (6134508433464846627) -->
-    <skip />
-    <!-- no translation found for auto_replace_summary (1016177921245107750) -->
-    <skip />
-    <!-- no translation found for auto_caps (6021984352657087728) -->
-    <skip />
-    <!-- no translation found for auto_caps_summary (4783973594319542220) -->
-    <skip />
-    <!-- no translation found for auto_punctuate (2819742922158924703) -->
-    <skip />
-    <!-- no translation found for auto_punctuate_summary (2664143621323054924) -->
-    <skip />
-    <!-- no translation found for show_password (2353636034424349266) -->
-    <skip />
-    <!-- no translation found for show_password_summary (3920555488855590831) -->
-    <skip />
-    <!-- no translation found for testing (555268605244514909) -->
-    <skip />
-    <!-- no translation found for testing_phone_info (8718517606602144606) -->
-    <skip />
-    <!-- no translation found for testing_battery_info (3826036256683980425) -->
-    <skip />
-    <!-- no translation found for quick_launch_title (5423323579273213815) -->
-    <skip />
-    <!-- no translation found for quick_launch_summary (1272194567210324017) -->
-    <skip />
-    <!-- no translation found for quick_launch_assign_application (5949445664563354321) -->
-    <skip />
-    <!-- no translation found for quick_launch_no_shortcut (5958195604101558965) -->
-    <skip />
-    <!-- no translation found for quick_launch_shortcut (1115195051591830635) -->
-    <skip />
-    <!-- no translation found for quick_launch_clear_dialog_title (5217130241215296612) -->
-    <skip />
-    <!-- no translation found for quick_launch_clear_dialog_message (3420665419624963430) -->
-    <skip />
-    <!-- no translation found for quick_launch_clear_ok_button (2442832413597511429) -->
-    <skip />
-    <!-- no translation found for quick_launch_clear_cancel_button (1437354385792055993) -->
-    <skip />
-    <!-- no translation found for quick_launch_display_mode_applications (6570683843184675363) -->
-    <skip />
-    <!-- no translation found for quick_launch_display_mode_shortcuts (6642750364678074004) -->
-    <skip />
-    <!-- no translation found for input_methods_settings_title (1752662012056721926) -->
-    <skip />
-    <!-- no translation found for input_methods_settings_summary (5481367119142131313) -->
-    <skip />
-    <!-- no translation found for development_settings_title (4671731485005432632) -->
-    <skip />
-    <!-- no translation found for development_settings_summary (5518361138194831299) -->
-    <skip />
-    <!-- no translation found for enable_adb (7770070343289262572) -->
-    <skip />
-    <!-- no translation found for enable_adb_summary (1498997582065835981) -->
-    <skip />
-    <!-- no translation found for keep_screen_on (5805533478834516956) -->
-    <skip />
-    <!-- no translation found for keep_screen_on_summary (5703353541069794974) -->
-    <skip />
-    <!-- no translation found for allow_mock_location (6204808904743157937) -->
-    <skip />
-    <!-- no translation found for allow_mock_location_summary (3154837501223277592) -->
-    <skip />
-</resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 2dfbae1..4c4edc7 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -53,4 +53,15 @@
     <!-- no translation found for wifi_sleep_policy_entries:0 (3804733751095821976) -->
     <!-- no translation found for wifi_sleep_policy_entries:1 (1549288661423279207) -->
     <!-- no translation found for wifi_sleep_policy_entries:2 (1986753720941888596) -->
+    <!-- no translation found for battery_history_type_spinner:0 (2372160040893842611) -->
+    <!-- no translation found for battery_history_type_spinner:1 (7042951832385599110) -->
+    <!-- no translation found for battery_history_type_spinner:2 (7643330117743172161) -->
+    <!-- no translation found for battery_history_type_spinner:3 (7984071435080498080) -->
+    <!-- no translation found for battery_history_which_spinner:0 (8777827398176661463) -->
+    <!-- no translation found for battery_history_which_spinner:1 (2351620008414691945) -->
+    <!-- no translation found for battery_history_which_spinner:2 (1233325583071371898) -->
+    <!-- no translation found for battery_history_which_spinner:3 (524850874274605031) -->
+    <!-- no translation found for usage_stats_display_order_types:0 (9077371706468756228) -->
+    <!-- no translation found for usage_stats_display_order_types:1 (1908750532762193304) -->
+    <!-- no translation found for usage_stats_display_order_types:2 (1213951670006606353) -->
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 877a3c3..64217b8 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -16,9 +16,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="device_info_default">"Desconocido"</string>
-    <string name="device_info_uptime">"Tiempo de actividad"</string>
-    <string name="device_info_awaketime">"Tiempo de actividad"</string>
-    <string name="device_info_asleeptime">"Tiempo de inactividad"</string>
     <string name="turn_on_radio">"Activar radio"</string>
     <string name="turn_off_radio">"Desactivar radio"</string>
     <string name="turn_on_qxdm">"Habilitar registro QXDM de SD"</string>
@@ -52,14 +49,13 @@
     <string name="radioInfo_lac">"LAC"</string>
     <string name="radioInfo_cid">"CID"</string>
     <string name="sdcard_unmount">"Desmontar tarjeta SD"</string>
+    <!-- no translation found for sdcard_format (362497552060004057) -->
+    <skip />
     <string name="small_font">"Pequeño"</string>
     <string name="medium_font">"Mediano"</string>
     <string name="large_font">"Grande"</string>
     <string name="font_size_save">"Aceptar"</string>
     <string name="sdcard_setting">"Tarjeta SD"</string>
-    <string name="screen_off_timeout_label">"Tiempo de espera ilimitado durante la carga"</string>
-    <string name="stay_on">"La pantalla está siempre encendida durante la carga."</string>
-    <string name="app_launcher_newView_text">"Iniciador de aplicaciones nuevo"</string>
     <string name="battery_info_status_label">"Estado de la batería:"</string>
     <string name="battery_info_scale_label">"Nivel de batería:"</string>
     <string name="battery_info_level_label">"Nivel de batería:"</string>
@@ -87,11 +83,6 @@
     <string name="battery_info_health_over_voltage">"Sobretensión"</string>
     <string name="battery_info_health_unspecified_failure">"Error desconocido"</string>
     <string name="bluetooth">"Bluetooth"</string>
-    <string name="bluetooth_stopping">"Bluetooth en interrupción..."</string>
-    <string name="bluetooth_disabled">"Activar Bluetooth"</string>
-    <!-- no translation found for bluetooth_enabled (314506563815464155) -->
-    <skip />
-    <string name="bluetooth_enabling">"Activando Bluetooth..."</string>
     <string name="bluetooth_visibility">"Visible"</string>
     <string name="bluetooth_is_discoverable">"Visible durante <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> segundos..."</string>
     <string name="bluetooth_not_discoverable">"Hacer visible el dispositivo"</string>
@@ -99,7 +90,6 @@
     <string name="bluetooth_device_name">"Nombre del dispositivo"</string>
     <string name="bluetooth_name_not_set">"No se ha establecido ningún nombre; se utiliza el nombre de cuenta."</string>
     <string name="bluetooth_scan_for_devices">"Buscar dispositivos"</string>
-    <string name="bluetooth_clear_list">"Borrar lista de dispositivos"</string>
     <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> se desconectará."</string>
     <string name="bluetooth_connected">"Conectado"</string>
     <string name="bluetooth_disconnected">"Desconectada"</string>
@@ -108,17 +98,9 @@
     <!-- no translation found for bluetooth_unknown (644716244548801421) -->
     <skip />
     <string name="bluetooth_not_connected">"Sincronizar con este dispositivo"</string>
-    <string name="bluetooth_failed_to_enable">"No se ha podido activar la función Bluetooth."</string>
     <string name="bluetooth_pairing">"Sincronizando..."</string>
-    <string name="failed_to_pair">"No se ha podido realizar la sincronización con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="failed_to_connect">"No se ha podido establecer conexión con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_paired">"Sincronizado"</string>
-    <string name="bluetooth_paired_not_nearby">"Sincronizado"</string>
     <string name="bluetooth_device">"manos libres/auriculares"</string>
-    <string name="bluetooth_disconnect">"Desconectar"</string>
-    <string name="bluetooth_connect">"Establecer conexión"</string>
-    <string name="bluetooth_unpair">"Desincronizar"</string>
-    <string name="bluetooth_pair">"Sincronizar"</string>
     <string name="progress_scanning">"Buscando..."</string>
     <string name="bluetooth_notif_ticker">"Solicitud de sincronización de Bluetooth"</string>
     <string name="bluetooth_notif_title">"Solicitud de sincronización"</string>
@@ -136,16 +118,6 @@
     <string name="intent_sender_startactivity_text">"Iniciar <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label">"Cuenta:"</string>
-    <string name="keyguard_pw_mod_text">"Seleccionar patrón de bloqueo"</string>
-    <string name="keyguard_pin_mod_text">"Cambiar PIN"</string>
-    <string name="keyguard_label">"Keyguard"</string>
-    <string name="keyguard_sim_pin_label">"PIN de tarjeta SIM"</string>
-    <string name="keyguard_password_old_password_error_text">"La contraseña antigua que has introducido no es correcta. Inténtalo de nuevo."</string>
-    <string name="keyguard_password_button_text">"Aceptar"</string>
-    <string name="keyguard_password_confirm_new_label">"Confirmar contraseña nueva:"</string>
-    <string name="keyguard_password_new_label">"Contraseña nueva:"</string>
-    <string name="keyguard_password_old_label">"Contraseña antigua:"</string>
-    <string name="keyguard_password_mismatch_error_text">"Las dos contraseñas no coinciden. Vuelve a introducirlas."</string>
     <string name="proxy_clear_text">"Borrar"</string>
     <string name="proxy_port_label">"Puerto"</string>
     <string name="proxy_defaultView_text">"Restaurar valores predeterminados"</string>
@@ -188,15 +160,13 @@
     <string name="radio_info_smsc_label">"SMSC:"</string>
     <string name="radio_info_smsc_update_label">"Actualizar"</string>
     <string name="radio_info_smsc_refresh_label">"Actualizar"</string>
+    <!-- no translation found for radio_info_toggle_dns_check_label (8292252930563286858) -->
+    <skip />
     <string name="band_mode_title">"Establecer banda GSM/UMTS"</string>
     <string name="band_mode_loading">"Cargando lista de bandas..."</string>
     <string name="band_mode_set">"Establecer"</string>
     <string name="band_mode_failed">"Con error"</string>
     <string name="band_mode_succeeded">"Correcto"</string>
-    <string name="ringer_volume_ringer_mode_label">"Modo de timbre"</string>
-    <string name="ringer_volume_screen_increasing_text">"Timbre en aumento"</string>
-    <string name="ringer_volume_ringtone_label">"Tono"</string>
-    <string name="ringer_volume_instructions">"Utiliza los botones de volumen para ajustar el volumen del timbre."</string>
     <string name="sdcard_changes_instructions">"Los cambios se aplican cuando se vuelve a conectar el cable USB."</string>
     <string name="sdcard_settings_screen_mass_storage_text">"Habilitar almacenamiento masivo USB"</string>
     <string name="sdcard_settings_total_bytes_label">"Bytes totales:"</string>
@@ -208,20 +178,6 @@
     <string name="sdcard_settings_used_bytes_label">"Bytes utilizados:"</string>
     <string name="sdcard_settings_scanning_status">"Buscando medios en tarjeta SD..."</string>
     <string name="sdcard_settings_read_only_status">"Tarjeta SD montada en modo de sólo lectura"</string>
-    <string name="sdcard_removal_alert_title">"Extracción de tarjeta SD no segura"</string>
-    <string name="sdcard_unmountable_alert_title">"La tarjeta SD no se puede leer."</string>
-    <string name="telephony_user_label">"Usuario:"</string>
-    <string name="telephony_server_label">"Servidor:"</string>
-    <string name="telephony_name_label">"Nombre:"</string>
-    <string name="telephony_mmsc_label">"MMSC:"</string>
-    <string name="telephony_apn_label">"APN:"</string>
-    <string name="telephony_mcc_label">"MCC:"</string>
-    <string name="telephony_port_label">"Puerto:"</string>
-    <string name="telephony_password_label">"Contraseña:"</string>
-    <string name="telephony_proxy_label">"Proxy:"</string>
-    <string name="telephony_mnc_label">"MNC:"</string>
-    <string name="telephony_mmsproxy_label">"Proxy MMS:"</string>
-    <string name="telephony_mmsport_label">"Puerto de MMS:"</string>
     <string name="next_label">"Siguiente"</string>
     <string name="language_picker_title">"Configuración regional"</string>
     <string name="select_your_language">"Selecciona el idioma que prefieras."</string>
@@ -264,23 +220,12 @@
     <string name="bluetooth_settings_summary">"Administrar conexiones, establecer el nombre del dispositivo y la visibilidad"</string>
     <string name="bluetooth_pin_entry">"Solicitud de sincronización de Bluetooth"</string>
     <string name="bluetooth_device_info">"Información de dispositivo Bluetooth"</string>
-    <string name="bluetooth_pairing_msg">"Sincronizando..."</string>
     <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Introduce el PIN para la sincronización."\n"(Prueba con 0000 ó 1234)."</string>
     <string name="bluetooth_error_title">"Atención"</string>
     <string name="bluetooth_pairing_error_message">"Se ha producido un problema al realizar la sincronización con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_alternate_error_message">"Se ha producido un problema al realizar la sincronización con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Prueba con otro PIN."</string>
     <string name="bluetooth_pairing_pin_error_message">"Se ha producido un problema al realizar la sincronización con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, porque el PIN introducido es incorrecto."</string>
     <string name="bluetooth_connecting_error_message">"Se ha producido un problema al establecer conexión con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_new_data">"Introducir datos nuevos"</string>
-    <string name="bluetooth_new_data_confirm">"Aceptar"</string>
-    <string name="bluetooth_new_data_cancel">"Cancelar"</string>
-    <string name="bluetooth_scan_for_new_devices">"Buscando dispositivos nuevos..."</string>
-    <string name="bluetooth_discoverability_panel_title">"Convertirme en..."</string>
-    <string name="bluetooth_discoverable">"Visible durante <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> segundos"</string>
-    <string name="bluetooth_connectable">"Sólo conexión"</string>
-    <string name="bluetooth_neither">"No se puede ver ni establecer conexión con él."</string>
     <string name="bluetooth_preference_scan_title">"Buscar dispositivos"</string>
-    <string name="bluetooth_preference_scan_summary">"Buscar dispositivos con los que realizar sincronización"</string>
     <string name="bluetooth_device_context_connect">"Establecer conexión"</string>
     <string name="bluetooth_device_context_disconnect">"Desconectar"</string>
     <string name="bluetooth_device_context_pair_connect">"Sincronizar y conectar"</string>
@@ -420,32 +365,24 @@
     <string name="sound_effects_enable_title">"Selección sonora"</string>
     <string name="sound_effects_enable_summary_on">"Reproducir sonido cuando se realiza una selección de pantalla"</string>
     <string name="sound_effects_enable_summary_off">"Reproducir sonido cuando se realiza una selección de pantalla"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_title (1008791464029179529) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (426729807044947187) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (803791141563778934) -->
+    <skip />
     <string name="sync_settings">"Sincronización de datos"</string>
     <string name="sync_settings_summary">"Seleccionar las aplicaciones que están sincronizadas"</string>
-    <string name="sync_settings_header_general_settings">"Configuración de sincronización general"</string>
-    <string name="sync_settings_header_application_settings">"Configuración de sincronización de aplicación"</string>
-    <string name="sync_too_many_deletes">"Límite de eliminaciones superado"</string>
-    <string name="sync_automatically">"Sincronización automática"</string>
-    <string name="sync_enabled">"Sincronizar datos de forma automática"</string>
-    <string name="sync_disabled">"Seleccionar para sincronizar los datos automáticamente"</string>
-    <string name="sync_menu_sync_now">"Sincronizar ahora"</string>
-    <string name="sync_menu_sync_cancel">"Cancelar sincronización"</string>
-    <string name="sync_gmail">"Gmail"</string>
-    <string name="sync_calendar">"Calendar"</string>
-    <string name="sync_contacts">"Contactos"</string>
-    <string name="sync_too_many_deletes_desc">"Hay <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> elementos eliminados para <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>, cuenta <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>. ¿Qué quieres hacer?"</string>
-    <string name="sync_really_delete">"Eliminar los elementos"</string>
-    <string name="sync_undo_deletes">"Deshacer las eliminaciones."</string>
-    <string name="sync_do_nothing">"No hacer nada por ahora"</string>
-    <string name="sync_is_failing">"En este momento hay problemas con la sincronización. Se restablecerá en breve."</string>
-    <string name="sync_plug"><font fgcolor="#ffffffff">"Te damos la bienvenida a Google Sync."</font>" "\n"Un servicio de Google para sincronizar datos y permitir así el acceso a tus contactos, citas, etc., desde cualquier ubicación."</string>
     <string name="display_settings">"Configuración de pantalla"</string>
     <string name="animations_title">"Animación"</string>
     <string name="animations_summary_on">"Mostrar animación al abrir o cerrar ventanas"</string>
     <string name="animations_summary_off">"Mostrar animación al abrir o cerrar ventanas"</string>
     <string name="brightness">"Brillo"</string>
+    <!-- no translation found for brightness_summary (838917350127550703) -->
+    <skip />
     <string name="screen_timeout">"Tiempo de espera de la pantalla"</string>
-    <string name="dim_screen">"Atenuar pantalla"</string>
+    <!-- no translation found for screen_timeout_summary (2905757633140605334) -->
+    <skip />
     <string name="sim_lock_settings">"Configuración de bloqueo de tarjeta SIM"</string>
     <string name="sim_lock_settings_category">"Configurar bloqueo de tarjeta SIM"</string>
     <string name="sim_lock_settings_title">"Bloqueo de tarjeta SIM"</string>
@@ -493,13 +430,24 @@
     <string name="status_wifi_mac_address">"Dirección MAC de la red Wi-Fi"</string>
     <string name="status_bt_address">"Dirección de Bluetooth"</string>
     <string name="status_unavailable">"No disponible"</string>
+    <!-- no translation found for status_network_traffic_stats (2089739529980224804) -->
+    <skip />
+    <!-- no translation found for status_network_traffic_summary (1456797220417923108) -->
+    <skip />
     <string name="status_up_time">"Tiempo de actividad"</string>
     <string name="status_awake_time">"Tiempo de actividad"</string>
     <string name="internal_memory">"Almacenamiento interno del teléfono"</string>
     <string name="sd_memory">"Tarjeta SD"</string>
     <string name="memory_available">"Espacio disponible"</string>
     <string name="memory_size">"Espacio total"</string>
-    <string name="sd_eject">"Desmontar/retirar la tarjeta SD"</string>
+    <!-- no translation found for sd_eject (6915293408836853020) -->
+    <skip />
+    <!-- no translation found for sd_eject_summary (3315557796211542962) -->
+    <skip />
+    <!-- no translation found for sd_format (5448738337382712203) -->
+    <skip />
+    <!-- no translation found for sd_format_summary (6616491027883134004) -->
+    <skip />
     <string name="sd_unavailable">"No disponible"</string>
     <string name="read_only">"(Sólo lectura)"</string>
     <string name="battery_status_title">"Estado de la batería"</string>
@@ -538,6 +486,22 @@
     <string name="master_clear_gesture_prompt">"Crea tu patrón de desbloqueo."</string>
     <string name="master_clear_gesture_explanation">"Debes crear un patrón de desbloqueo para confirmar el reinicio del teléfono."</string>
     <string name="master_clear_failed">"No se ha reiniciado el sistema porque el servicio Borrado del sistema no está disponible."</string>
+    <!-- no translation found for media_format_title (4671276096695789895) -->
+    <skip />
+    <!-- no translation found for media_format_summary (3805714639375830120) -->
+    <skip />
+    <!-- no translation found for media_format_desc (1142563222357820834) -->
+    <skip />
+    <!-- no translation found for media_format_button_text (370856400090190151) -->
+    <skip />
+    <!-- no translation found for media_format_final_desc (1776666694910717198) -->
+    <skip />
+    <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_prompt (3109349468816856670) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_explanation (4239529439389660159) -->
+    <skip />
     <string name="call_settings_title">"Configuración de llamada"</string>
     <string name="call_settings_summary">"Configurar buzón de voz, desvío de llamadas, llamada en espera, identificador de llamada"</string>
     <string name="network_settings_title">"Redes móviles"</string>
@@ -591,17 +555,25 @@
     <string name="lock_example_title">"Patrón de ejemplo"</string>
     <string name="lock_example_message">"Une al menos cuatro puntos."\n" "\n"Selecciona \"Siguiente\" cuando estés preparado para crear tu propio patrón."</string>
     <string name="manageapplications_settings_title">"Administrar aplicaciones"</string>
+    <!-- no translation found for manageapplications_settings_summary (6097117021500651232) -->
+    <skip />
     <string name="applications_settings">"Aplicaciones"</string>
     <string name="applications_settings_summary">"Administrar aplicaciones, configurar accesos directos de inicio rápido"</string>
     <string name="applications_settings_header">"Configuración de aplicaciones"</string>
     <string name="install_applications">"Orígenes desconocidos"</string>
     <string name="install_unknown_applications">"Permitir la instalación de aplicaciones distintas de Market"</string>
     <string name="install_all_warning">"El teléfono y los datos personales son más vulnerables a los ataques de aplicaciones de origen desconocido. El usuario acuerda ser el único responsable de cualquier daño en el teléfono o pérdida de datos que se pueda derivar del uso de estas aplicaciones."</string>
-    <string name="manage_applications_title">"Administrar aplicaciones"</string>
     <string name="application_info_label">"Información de la aplicación"</string>
     <string name="storage_label">"Almacenamiento"</string>
     <string name="auto_launch_label">"Ejecutar de forma predeterminada"</string>
     <string name="permissions_label">"Permisos"</string>
+    <string name="cache_header_label">"Caché"</string>
+    <string name="clear_cache_btn_text">"Borrar caché"</string>
+    <string name="cache_size_label">"Caché"</string>
+    <!-- no translation found for controls_label (7611113077086853799) -->
+    <skip />
+    <!-- no translation found for force_stop (7435006169872876756) -->
+    <skip />
     <string name="total_size_label">"Total"</string>
     <string name="application_size_label">"Aplicación"</string>
     <string name="data_size_label">"Datos"</string>
@@ -614,6 +586,10 @@
     <string name="sort_order_alpha">"Ordenar"</string>
     <string name="sort_order_size">"Ordenar por tamaño"</string>
     <string name="manage_space_text">"Administrar espacio"</string>
+    <!-- no translation found for filter (2018011724373033887) -->
+    <skip />
+    <!-- no translation found for filter_dlg_title (6507663329723966854) -->
+    <skip />
     <string name="filter_apps_all">"Todas"</string>
     <string name="filter_apps_third_party">"Externas"</string>
     <string name="filter_apps_running">"En ejecución"</string>
@@ -627,22 +603,24 @@
     <string name="app_not_found_dlg_text">"No se ha encontrado la aplicación en la lista de aplicaciones instaladas."</string>
     <string name="clear_data_failed">"No se han podido borrar los datos de aplicación."</string>
     <string name="security_settings_desc">"Esta aplicación puede acceder a los siguientes elementos del teléfono:"</string>
-    <string name="computing_size">"Aún calculando..."</string>
+    <!-- no translation found for computing_size (1599186977475211186) -->
+    <skip />
     <string name="invalid_size_value">"No se ha podido calcular el tamaño del paquete."</string>
     <string name="empty_list_msg">"No tienes instalada ninguna aplicación externa."</string>
-    <string name="cache_header_label">"Caché"</string>
-    <string name="clear_cache_btn_text">"Borrar caché"</string>
-    <string name="cache_size_label">"Caché"</string>
     <string name="language_settings">"Configuración regional y texto"</string>
     <string name="language_settings_summary">"Establecer opciones de autocorrección, introducción de texto y configuración regional (idioma y región)"</string>
     <string name="language_category">"Configuración regional"</string>
     <string name="text_category">"Configuración de texto"</string>
     <string name="phone_language">"Seleccionar configuración local"</string>
+    <!-- no translation found for phone_language_summary (1809580675831352352) -->
+    <skip />
     <string name="auto_replace">"Reemplazar automáticamente"</string>
     <string name="auto_replace_summary">"Corregir palabras con errores de escritura"</string>
     <string name="auto_caps">"Mayúsculas automáticas"</string>
     <string name="auto_caps_summary">"Escribir en mayúsculas la primera letra de las frases"</string>
     <string name="auto_punctuate">"Puntuación automática"</string>
+    <!-- no translation found for hardkeyboard_category (5957168411305769899) -->
+    <skip />
     <string name="auto_punctuate_summary">"Pulse la tecla Espacio dos veces para insertar el carácter \".\"."</string>
     <string name="show_password">"Contraseñas visibles"</string>
     <string name="show_password_summary">"Mostrar contraseña mientras se escribe"</string>
@@ -690,4 +668,68 @@
     <string name="keep_screen_on_summary">"La pantalla nunca entra en modo de suspensión durante la carga"</string>
     <string name="allow_mock_location">"Permitir ubicaciones simuladas"</string>
     <string name="allow_mock_location_summary">"Permitir ubicaciones simuladas"</string>
+    <!-- no translation found for battery_history_known_apps (6907374478255786240) -->
+    <skip />
+    <!-- no translation found for gadget_picker_title (4335873961457985189) -->
+    <skip />
+    <!-- no translation found for battery_history_details_for (5189636461798594740) -->
+    <skip />
+    <!-- no translation found for battery_history_uid (1016606150528436298) -->
+    <skip />
+    <!-- no translation found for battery_history_network_usage (8010852371665217020) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_received (980307569180518302) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_sent (2501748768602119159) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_total (4444807574361642753) -->
+    <skip />
+    <!-- no translation found for battery_history_cpu_usage (2597353713014790877) -->
+    <skip />
+    <!-- no translation found for battery_history_user_time (6227507614894791359) -->
+    <skip />
+    <!-- no translation found for battery_history_system_time (2015862072724507547) -->
+    <skip />
+    <!-- no translation found for battery_history_total_time (3618703970098556104) -->
+    <skip />
+    <!-- no translation found for battery_history_starts (9137453931978571696) -->
+    <skip />
+    <!-- no translation found for battery_history_days (6387593985264923377) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (2593055276272350197) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (5608990219891318138) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (7397664460929461350) -->
+    <skip />
+    <!-- no translation found for battery_history_packages_sharing_this_uid (4101596071379250050) -->
+    <skip />
+    <!-- no translation found for battery_history_no_data (1177238743237067617) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor (2333488996028993982) -->
+    <skip />
+    <!-- no translation found for battery_history_used_by_packages (3000711380023436470) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage (3593133338613209024) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage_multi (4536084375991014508) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on (1377240025275657277) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_battery (536058210445081888) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_plugged (5019127390021871260) -->
+    <skip />
+    <!-- no translation found for usage_stats_label (5890846333487083609) -->
+    <skip />
+    <!-- no translation found for testing_usage_stats (7823048598893937339) -->
+    <skip />
+    <!-- no translation found for display_order_text (8592776965827565271) -->
+    <skip />
+    <!-- no translation found for app_name_label (2000949925256858308) -->
+    <skip />
+    <!-- no translation found for launch_count_label (4019444833263957024) -->
+    <skip />
+    <!-- no translation found for usage_time_label (295954901452833058) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 3ed4556..147d385 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -53,4 +53,15 @@
     <!-- no translation found for wifi_sleep_policy_entries:0 (3804733751095821976) -->
     <!-- no translation found for wifi_sleep_policy_entries:1 (1549288661423279207) -->
     <!-- no translation found for wifi_sleep_policy_entries:2 (1986753720941888596) -->
+    <!-- no translation found for battery_history_type_spinner:0 (2372160040893842611) -->
+    <!-- no translation found for battery_history_type_spinner:1 (7042951832385599110) -->
+    <!-- no translation found for battery_history_type_spinner:2 (7643330117743172161) -->
+    <!-- no translation found for battery_history_type_spinner:3 (7984071435080498080) -->
+    <!-- no translation found for battery_history_which_spinner:0 (8777827398176661463) -->
+    <!-- no translation found for battery_history_which_spinner:1 (2351620008414691945) -->
+    <!-- no translation found for battery_history_which_spinner:2 (1233325583071371898) -->
+    <!-- no translation found for battery_history_which_spinner:3 (524850874274605031) -->
+    <!-- no translation found for usage_stats_display_order_types:0 (9077371706468756228) -->
+    <!-- no translation found for usage_stats_display_order_types:1 (1908750532762193304) -->
+    <!-- no translation found for usage_stats_display_order_types:2 (1213951670006606353) -->
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9178b7d..8d76ce7 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -16,9 +16,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="device_info_default">"Inconnu"</string>
-    <string name="device_info_uptime">"Durée d\'activité"</string>
-    <string name="device_info_awaketime">"Temps en activité"</string>
-    <string name="device_info_asleeptime">"Temps en veille"</string>
     <string name="turn_on_radio">"Allumer la radio"</string>
     <string name="turn_off_radio">"Éteindre la radio"</string>
     <string name="turn_on_qxdm">"Activer le journal SD QXDM"</string>
@@ -52,14 +49,13 @@
     <string name="radioInfo_lac">"LAC"</string>
     <string name="radioInfo_cid">"CID"</string>
     <string name="sdcard_unmount">"Retirer la carte SD"</string>
+    <!-- no translation found for sdcard_format (362497552060004057) -->
+    <skip />
     <string name="small_font">"Petite"</string>
     <string name="medium_font">"Moyenne"</string>
     <string name="large_font">"Grande"</string>
     <string name="font_size_save">"OK"</string>
     <string name="sdcard_setting">"Carte SD"</string>
-    <string name="screen_off_timeout_label">"Ne jamais se déconnecter pendant le chargement"</string>
-    <string name="stay_on">"L\'écran reste toujours allumé lors du chargement."</string>
-    <string name="app_launcher_newView_text">"Nouvel AppLauncher"</string>
     <string name="battery_info_status_label">"État de la batterie :"</string>
     <string name="battery_info_scale_label">"Batterie :"</string>
     <string name="battery_info_level_label">"Niveau de la batterie :"</string>
@@ -87,11 +83,6 @@
     <string name="battery_info_health_over_voltage">"Voltage dépassé"</string>
     <string name="battery_info_health_unspecified_failure">"Erreur inconnue"</string>
     <string name="bluetooth">"Bluetooth"</string>
-    <string name="bluetooth_stopping">"Arrêt du Bluetooth..."</string>
-    <string name="bluetooth_disabled">"Activer Bluetooth"</string>
-    <!-- no translation found for bluetooth_enabled (314506563815464155) -->
-    <skip />
-    <string name="bluetooth_enabling">"Activation du mode Bluetooth..."</string>
     <string name="bluetooth_visibility">"Identifiable"</string>
     <string name="bluetooth_is_discoverable">"Identifiable pendant <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> secondes..."</string>
     <string name="bluetooth_not_discoverable">"Permettre l\'identification de l\'appareil"</string>
@@ -99,7 +90,6 @@
     <string name="bluetooth_device_name">"Nom du périphérique"</string>
     <string name="bluetooth_name_not_set">"Aucun nom n\'a été défini. Utilisation du nom du compte..."</string>
     <string name="bluetooth_scan_for_devices">"Rechercher des périphériques"</string>
-    <string name="bluetooth_clear_list">"Effacer la liste de périphériques"</string>
     <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va être déconnecté."</string>
     <string name="bluetooth_connected">"Connecté"</string>
     <string name="bluetooth_disconnected">"Déconnecté"</string>
@@ -108,17 +98,9 @@
     <!-- no translation found for bluetooth_unknown (644716244548801421) -->
     <skip />
     <string name="bluetooth_not_connected">"Associer à ce périphérique"</string>
-    <string name="bluetooth_failed_to_enable">"Impossible d\'activer le mode Bluetooth"</string>
     <string name="bluetooth_pairing">"Association…"</string>
-    <string name="failed_to_pair">"Association à <xliff:g id="DEVICE_NAME">%1$s</xliff:g> impossible."</string>
-    <string name="failed_to_connect">"Impossible de se connecter à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_paired">"Associé"</string>
-    <string name="bluetooth_paired_not_nearby">"Associé(s)"</string>
     <string name="bluetooth_device">"mains libres/casque"</string>
-    <string name="bluetooth_disconnect">"Déconnecter"</string>
-    <string name="bluetooth_connect">"Se connecter"</string>
-    <string name="bluetooth_unpair">"Dissocier"</string>
-    <string name="bluetooth_pair">"Associer"</string>
     <string name="progress_scanning">"Recherche"</string>
     <string name="bluetooth_notif_ticker">"Demande d\'association Bluetooth"</string>
     <string name="bluetooth_notif_title">"Demande d\'association"</string>
@@ -136,16 +118,6 @@
     <string name="intent_sender_startactivity_text">"Lancer <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g> :"</string>
     <string name="intent_sender_account_label">"Compte :"</string>
-    <string name="keyguard_pw_mod_text">"Sélectionner un motif de déverrouillage"</string>
-    <string name="keyguard_pin_mod_text">"Modifier le code PIN"</string>
-    <string name="keyguard_label">"Protection des touches"</string>
-    <string name="keyguard_sim_pin_label">"Code PIN de la carte SIM"</string>
-    <string name="keyguard_password_old_password_error_text">"L\'ancien mot de passe saisi est incorrect. Veuillez réessayer."</string>
-    <string name="keyguard_password_button_text">"OK"</string>
-    <string name="keyguard_password_confirm_new_label">"Confirmer le nouveau mot de passe :"</string>
-    <string name="keyguard_password_new_label">"Nouveau mot de passe :"</string>
-    <string name="keyguard_password_old_label">"Ancien mot de passe :"</string>
-    <string name="keyguard_password_mismatch_error_text">"Les deux mots de passe ne correspondent pas. Veuillez les ressaisir."</string>
     <string name="proxy_clear_text">"Effacer"</string>
     <string name="proxy_port_label">"Port"</string>
     <string name="proxy_defaultView_text">"Rétablir les paramètres par défaut"</string>
@@ -188,15 +160,13 @@
     <string name="radio_info_smsc_label">"SMSC :"</string>
     <string name="radio_info_smsc_update_label">"Mettre à jour"</string>
     <string name="radio_info_smsc_refresh_label">"Actualiser"</string>
+    <!-- no translation found for radio_info_toggle_dns_check_label (8292252930563286858) -->
+    <skip />
     <string name="band_mode_title">"Définir la bande GSM/UMTS"</string>
     <string name="band_mode_loading">"Chargement de la liste de bandes..."</string>
     <string name="band_mode_set">"Définir"</string>
     <string name="band_mode_failed">"Échec"</string>
     <string name="band_mode_succeeded">"Terminé"</string>
-    <string name="ringer_volume_ringer_mode_label">"Mode de sonnerie"</string>
-    <string name="ringer_volume_screen_increasing_text">"Volume de sonnerie croissant"</string>
-    <string name="ringer_volume_ringtone_label">"Sonnerie"</string>
-    <string name="ringer_volume_instructions">"Utiliser les boutons de volume pour régler le volume de la sonnerie"</string>
     <string name="sdcard_changes_instructions">"Les modifications prendront effet lors de la prochaine connexion du câble USB."</string>
     <string name="sdcard_settings_screen_mass_storage_text">"Activer le stockage de masse USB"</string>
     <string name="sdcard_settings_total_bytes_label">"Octets au total :"</string>
@@ -208,20 +178,6 @@
     <string name="sdcard_settings_used_bytes_label">"Octets utilisés :"</string>
     <string name="sdcard_settings_scanning_status">"Recherche de médias sur la carte SD…"</string>
     <string name="sdcard_settings_read_only_status">"Carte SD montée en lecture seule"</string>
-    <string name="sdcard_removal_alert_title">"Attention ! Ne retirez pas la carte SD !"</string>
-    <string name="sdcard_unmountable_alert_title">"Impossible de lire la carte SD"</string>
-    <string name="telephony_user_label">"Utilisateur :"</string>
-    <string name="telephony_server_label">"Serveur :"</string>
-    <string name="telephony_name_label">"Nom :"</string>
-    <string name="telephony_mmsc_label">"MMSC :"</string>
-    <string name="telephony_apn_label">"APN :"</string>
-    <string name="telephony_mcc_label">"MCC :"</string>
-    <string name="telephony_port_label">"Port "</string>
-    <string name="telephony_password_label">"Mot de passe :"</string>
-    <string name="telephony_proxy_label">"Proxy :"</string>
-    <string name="telephony_mnc_label">"MNC :"</string>
-    <string name="telephony_mmsproxy_label">"Proxy MMS :"</string>
-    <string name="telephony_mmsport_label">"Port MMS :"</string>
     <string name="next_label">"Suivant"</string>
     <string name="language_picker_title">"Paramètres régionaux"</string>
     <string name="select_your_language">"Choisir la langue"</string>
@@ -255,7 +211,7 @@
     <string name="zone_list_menu_sort_alphabetically">"Trier par ordre alphabétique"</string>
     <string name="zone_list_menu_sort_by_timezone">"Trier par fuseau horaire"</string>
     <string name="security_settings_title">"Sécurité et position géographique"</string>
-    <string name="security_settings_summary">"Définir Ma position géographique, le déverrouillage de l\'écran et le blocage de la carte SIM"</string>
+    <string name="security_settings_summary">"Définir Ma position, le déverrouillage de l\'écran et le blocage de la carte SIM"</string>
     <string name="security_passwords_title">"Mots de passe"</string>
     <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary">"Activer Bluetooth"</string>
@@ -264,23 +220,12 @@
     <string name="bluetooth_settings_summary">"Gérer les connexions, configurer le nom et l\'identification de l\'appareil"</string>
     <string name="bluetooth_pin_entry">"Demande d\'association Bluetooth"</string>
     <string name="bluetooth_device_info">"Informations sur le périphérique Bluetooth"</string>
-    <string name="bluetooth_pairing_msg">"Association…"</string>
     <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Saisissez le code PIN pour associer l\'appareil."\n"(Essayez avec 0000 ou 1234.)"</string>
     <string name="bluetooth_error_title">"Attention"</string>
     <string name="bluetooth_pairing_error_message">"Un problème est survenu lors de l\'association à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_alternate_error_message">"Un problème est survenu lors de l\'association à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Veuillez essayer un autre code PIN."</string>
     <string name="bluetooth_pairing_pin_error_message">"Un problème est survenu lors de l\'association à <xliff:g id="DEVICE_NAME">%1$s</xliff:g> car le PIN saisi est incorrect."</string>
     <string name="bluetooth_connecting_error_message">"Un problème est survenu lors de la connexion à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_new_data">"Saisir de nouvelles données"</string>
-    <string name="bluetooth_new_data_confirm">"OK"</string>
-    <string name="bluetooth_new_data_cancel">"Annuler"</string>
-    <string name="bluetooth_scan_for_new_devices">"Recherche de nouveaux périphériques…"</string>
-    <string name="bluetooth_discoverability_panel_title">"Faites-moi..."</string>
-    <string name="bluetooth_discoverable">"Identifiable pendant <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> secondes"</string>
-    <string name="bluetooth_connectable">"Uniquement les périphériques pouvant être connectés"</string>
-    <string name="bluetooth_neither">"Ne peut être ni repéré, ni connecté"</string>
     <string name="bluetooth_preference_scan_title">"Rechercher des périphériques"</string>
-    <string name="bluetooth_preference_scan_summary">"Rechercher les appareils à associer"</string>
     <string name="bluetooth_device_context_connect">"Se connecter"</string>
     <string name="bluetooth_device_context_disconnect">"Déconnecter"</string>
     <string name="bluetooth_device_context_pair_connect">"Associer et connecter"</string>
@@ -420,32 +365,24 @@
     <string name="sound_effects_enable_title">"Sélection audible"</string>
     <string name="sound_effects_enable_summary_on">"Lire les sons lors des sélections à l\'écran"</string>
     <string name="sound_effects_enable_summary_off">"Lire le son lors des sélections à l\'écran"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_title (1008791464029179529) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (426729807044947187) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (803791141563778934) -->
+    <skip />
     <string name="sync_settings">"Synchronisation des données"</string>
     <string name="sync_settings_summary">"Sélectionner les applications à synchroniser"</string>
-    <string name="sync_settings_header_general_settings">"Paramètres généraux de synchronisation"</string>
-    <string name="sync_settings_header_application_settings">"Paramètres de synchronisation de l\'application"</string>
-    <string name="sync_too_many_deletes">"Limite de suppressions dépassée"</string>
-    <string name="sync_automatically">"Synchronisation automatique"</string>
-    <string name="sync_enabled">"Synchroniser automatiquement les données"</string>
-    <string name="sync_disabled">"Sélectionner cette option pour synchroniser automatiquement les données"</string>
-    <string name="sync_menu_sync_now">"Synchroniser maintenant"</string>
-    <string name="sync_menu_sync_cancel">"Annuler la synchronisation"</string>
-    <string name="sync_gmail">"Gmail"</string>
-    <string name="sync_calendar">"Calendrier"</string>
-    <string name="sync_contacts">"Contacts"</string>
-    <string name="sync_too_many_deletes_desc">"Le compte <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g> contient <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> éléments supprimés pour <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>. Que souhaitez-vous faire ?"</string>
-    <string name="sync_really_delete">"Supprimer les éléments."</string>
-    <string name="sync_undo_deletes">"Annuler les suppressions."</string>
-    <string name="sync_do_nothing">"Ne rien faire pour l\'instant."</string>
-    <string name="sync_is_failing">"La synchronisation rencontre des problèmes et sera bientôt rétablie."</string>
-    <string name="sync_plug"><font fgcolor="#ffffffff">"Bienvenue à Google Sync ! "</font>" "\n"Cette application Google vous permet de synchroniser vos données afin d\'accéder à vos contacts, rendez-vous et bien plus encore, où que vous soyez !"</string>
     <string name="display_settings">"Afficher les paramètres"</string>
     <string name="animations_title">"Animation"</string>
     <string name="animations_summary_on">"Afficher l\'animation lors de l\'ouverture/fermeture de fenêtres"</string>
     <string name="animations_summary_off">"Afficher l\'animation lors de l\'ouverture/fermeture de fenêtres"</string>
     <string name="brightness">"Luminosité"</string>
+    <!-- no translation found for brightness_summary (838917350127550703) -->
+    <skip />
     <string name="screen_timeout">"Mise en veille de l\'écran"</string>
-    <string name="dim_screen">"Assombrir l\'écran"</string>
+    <!-- no translation found for screen_timeout_summary (2905757633140605334) -->
+    <skip />
     <string name="sim_lock_settings">"Paramètres de blocage de la carte SIM"</string>
     <string name="sim_lock_settings_category">"Configurer le blocage de la carte SIM"</string>
     <string name="sim_lock_settings_title">"Blocage de la carte SIM"</string>
@@ -493,13 +430,24 @@
     <string name="status_wifi_mac_address">"Adresse MAC Wi-Fi"</string>
     <string name="status_bt_address">"Adresse Bluetooth"</string>
     <string name="status_unavailable">"Non disponible"</string>
+    <!-- no translation found for status_network_traffic_stats (2089739529980224804) -->
+    <skip />
+    <!-- no translation found for status_network_traffic_summary (1456797220417923108) -->
+    <skip />
     <string name="status_up_time">"Durée d\'activité"</string>
     <string name="status_awake_time">"Temps en activité"</string>
     <string name="internal_memory">"Mémoire interne du téléphone"</string>
     <string name="sd_memory">"Carte SD"</string>
     <string name="memory_available">"Espace disponible"</string>
     <string name="memory_size">"Espace total"</string>
-    <string name="sd_eject">"Démonter/éjecter la carte SD"</string>
+    <!-- no translation found for sd_eject (6915293408836853020) -->
+    <skip />
+    <!-- no translation found for sd_eject_summary (3315557796211542962) -->
+    <skip />
+    <!-- no translation found for sd_format (5448738337382712203) -->
+    <skip />
+    <!-- no translation found for sd_format_summary (6616491027883134004) -->
+    <skip />
     <string name="sd_unavailable">"Non disponible"</string>
     <string name="read_only">"(Lecture seule)"</string>
     <string name="battery_status_title">"État de la batterie"</string>
@@ -538,11 +486,27 @@
     <string name="master_clear_gesture_prompt">"Saisissez votre motif de déverrouillage"</string>
     <string name="master_clear_gesture_explanation">"Vous devez dessiner votre motif de déverrouillage pour confirmer la réinitialisation du téléphone."</string>
     <string name="master_clear_failed">"Les données n\'ont pas été réinitialisées car le service de nettoyage du système n\'est pas disponible."</string>
+    <!-- no translation found for media_format_title (4671276096695789895) -->
+    <skip />
+    <!-- no translation found for media_format_summary (3805714639375830120) -->
+    <skip />
+    <!-- no translation found for media_format_desc (1142563222357820834) -->
+    <skip />
+    <!-- no translation found for media_format_button_text (370856400090190151) -->
+    <skip />
+    <!-- no translation found for media_format_final_desc (1776666694910717198) -->
+    <skip />
+    <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_prompt (3109349468816856670) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_explanation (4239529439389660159) -->
+    <skip />
     <string name="call_settings_title">"Paramètres d\'appel"</string>
     <string name="call_settings_summary">"Configurer la messagerie vocale, les transferts d\'appel, les mises en attente, les identifiants d\'appelant"</string>
     <string name="network_settings_title">"Réseaux mobiles"</string>
     <string name="network_settings_summary">"Définir les options d\'itinérance, réseaux, noms de points d\'accès"</string>
-    <string name="location_title">"Sources pour Ma position géographique"</string>
+    <string name="location_title">"Sources pour Ma position"</string>
     <string name="location_network_based">"Utiliser les réseaux sans fil"</string>
     <string name="location_networks_disabled">"Afficher la position géographique dans les applications (comme Google Maps) lors de l\'utilisation de réseaux sans fil"</string>
     <string name="location_neighborhood_level">"Position géographique déterminée par réseaux Wi-Fi et/ou mobile"</string>
@@ -591,17 +555,25 @@
     <string name="lock_example_title">"Exemple de motif"</string>
     <string name="lock_example_message">"Reliez au moins quatre points."\n" "\n"Sélectionnez \"Suivant\" lorsque vous voulez créer votre propre motif."</string>
     <string name="manageapplications_settings_title">"Gérer les applications"</string>
+    <!-- no translation found for manageapplications_settings_summary (6097117021500651232) -->
+    <skip />
     <string name="applications_settings">"Applications"</string>
     <string name="applications_settings_summary">"Gérer les applications, configurer des raccourcis de lancement rapide"</string>
     <string name="applications_settings_header">"Paramètres de l\'application"</string>
     <string name="install_applications">"Sources inconnues"</string>
     <string name="install_unknown_applications">"Autoriser l\'installation d\'applications ne provenant pas d\'Android Market"</string>
     <string name="install_all_warning">"Votre téléphone et vos données personnelles sont très vulnérables face à des applications provenant de sources inconnues. Vous acceptez d\'être le seul responsable de tout dommage causé à votre téléphone ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
-    <string name="manage_applications_title">"Gérer les applications"</string>
     <string name="application_info_label">"Informations sur l\'application"</string>
     <string name="storage_label">"Mémoire"</string>
     <string name="auto_launch_label">"Lancer par défaut"</string>
     <string name="permissions_label">"Autorisations"</string>
+    <string name="cache_header_label">"Cache"</string>
+    <string name="clear_cache_btn_text">"Effacer le cache"</string>
+    <string name="cache_size_label">"Cache"</string>
+    <!-- no translation found for controls_label (7611113077086853799) -->
+    <skip />
+    <!-- no translation found for force_stop (7435006169872876756) -->
+    <skip />
     <string name="total_size_label">"Total"</string>
     <string name="application_size_label">"Application"</string>
     <string name="data_size_label">"Données"</string>
@@ -614,6 +586,10 @@
     <string name="sort_order_alpha">"Trier"</string>
     <string name="sort_order_size">"Trier par taille"</string>
     <string name="manage_space_text">"Gérer l\'espace"</string>
+    <!-- no translation found for filter (2018011724373033887) -->
+    <skip />
+    <!-- no translation found for filter_dlg_title (6507663329723966854) -->
+    <skip />
     <string name="filter_apps_all">"Tous"</string>
     <string name="filter_apps_third_party">"Tiers"</string>
     <string name="filter_apps_running">"En cours d\'exécution"</string>
@@ -627,22 +603,24 @@
     <string name="app_not_found_dlg_text">"L\'application n\'a pas été trouvée dans la liste des applications installées."</string>
     <string name="clear_data_failed">"Impossible d\'effacer les données de l\'application."</string>
     <string name="security_settings_desc">"Cette application peut accéder aux applications suivantes de votre téléphone :"</string>
-    <string name="computing_size">"Calcul toujours en cours…"</string>
+    <!-- no translation found for computing_size (1599186977475211186) -->
+    <skip />
     <string name="invalid_size_value">"Impossible de calculer la taille du paquet."</string>
     <string name="empty_list_msg">"Aucune application tierce n\'est installée sur votre téléphone."</string>
-    <string name="cache_header_label">"Cache"</string>
-    <string name="clear_cache_btn_text">"Effacer le cache"</string>
-    <string name="cache_size_label">"Cache"</string>
     <string name="language_settings">"Paramètres régionaux et texte"</string>
     <string name="language_settings_summary">"Définir les paramètres régionaux (langue et région), la saisie de texte et les options de correction automatique"</string>
     <string name="language_category">"Paramètres régionaux"</string>
     <string name="text_category">"Paramètres du texte"</string>
     <string name="phone_language">"Sélectionner les paramètres régionaux"</string>
+    <!-- no translation found for phone_language_summary (1809580675831352352) -->
+    <skip />
     <string name="auto_replace">"Remplacer automatiquement"</string>
     <string name="auto_replace_summary">"Corriger les mots mal saisis"</string>
     <string name="auto_caps">"Maj auto"</string>
     <string name="auto_caps_summary">"Mettre une majuscule en début de phrase"</string>
     <string name="auto_punctuate">"Ponctuation automatique"</string>
+    <!-- no translation found for hardkeyboard_category (5957168411305769899) -->
+    <skip />
     <string name="auto_punctuate_summary">"Appuyez deux fois sur la touche Espace pour insérer \".\""</string>
     <string name="show_password">"Mots de passe visibles"</string>
     <string name="show_password_summary">"Afficher le mot de passe lors de la saisie"</string>
@@ -690,4 +668,68 @@
     <string name="keep_screen_on_summary">"L\'écran ne se met jamais en veille lors du chargement"</string>
     <string name="allow_mock_location">"Autoriser les positions géographiques fictives"</string>
     <string name="allow_mock_location_summary">"Autoriser les positions géographiques fictives"</string>
+    <!-- no translation found for battery_history_known_apps (6907374478255786240) -->
+    <skip />
+    <!-- no translation found for gadget_picker_title (4335873961457985189) -->
+    <skip />
+    <!-- no translation found for battery_history_details_for (5189636461798594740) -->
+    <skip />
+    <!-- no translation found for battery_history_uid (1016606150528436298) -->
+    <skip />
+    <!-- no translation found for battery_history_network_usage (8010852371665217020) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_received (980307569180518302) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_sent (2501748768602119159) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_total (4444807574361642753) -->
+    <skip />
+    <!-- no translation found for battery_history_cpu_usage (2597353713014790877) -->
+    <skip />
+    <!-- no translation found for battery_history_user_time (6227507614894791359) -->
+    <skip />
+    <!-- no translation found for battery_history_system_time (2015862072724507547) -->
+    <skip />
+    <!-- no translation found for battery_history_total_time (3618703970098556104) -->
+    <skip />
+    <!-- no translation found for battery_history_starts (9137453931978571696) -->
+    <skip />
+    <!-- no translation found for battery_history_days (6387593985264923377) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (2593055276272350197) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (5608990219891318138) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (7397664460929461350) -->
+    <skip />
+    <!-- no translation found for battery_history_packages_sharing_this_uid (4101596071379250050) -->
+    <skip />
+    <!-- no translation found for battery_history_no_data (1177238743237067617) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor (2333488996028993982) -->
+    <skip />
+    <!-- no translation found for battery_history_used_by_packages (3000711380023436470) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage (3593133338613209024) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage_multi (4536084375991014508) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on (1377240025275657277) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_battery (536058210445081888) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_plugged (5019127390021871260) -->
+    <skip />
+    <!-- no translation found for usage_stats_label (5890846333487083609) -->
+    <skip />
+    <!-- no translation found for testing_usage_stats (7823048598893937339) -->
+    <skip />
+    <!-- no translation found for display_order_text (8592776965827565271) -->
+    <skip />
+    <!-- no translation found for app_name_label (2000949925256858308) -->
+    <skip />
+    <!-- no translation found for launch_count_label (4019444833263957024) -->
+    <skip />
+    <!-- no translation found for usage_time_label (295954901452833058) -->
+    <skip />
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 5f7e1ae..7fb3fc6 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -53,4 +53,15 @@
     <!-- no translation found for wifi_sleep_policy_entries:0 (3804733751095821976) -->
     <!-- no translation found for wifi_sleep_policy_entries:1 (1549288661423279207) -->
     <!-- no translation found for wifi_sleep_policy_entries:2 (1986753720941888596) -->
+    <!-- no translation found for battery_history_type_spinner:0 (2372160040893842611) -->
+    <!-- no translation found for battery_history_type_spinner:1 (7042951832385599110) -->
+    <!-- no translation found for battery_history_type_spinner:2 (7643330117743172161) -->
+    <!-- no translation found for battery_history_type_spinner:3 (7984071435080498080) -->
+    <!-- no translation found for battery_history_which_spinner:0 (8777827398176661463) -->
+    <!-- no translation found for battery_history_which_spinner:1 (2351620008414691945) -->
+    <!-- no translation found for battery_history_which_spinner:2 (1233325583071371898) -->
+    <!-- no translation found for battery_history_which_spinner:3 (524850874274605031) -->
+    <!-- no translation found for usage_stats_display_order_types:0 (9077371706468756228) -->
+    <!-- no translation found for usage_stats_display_order_types:1 (1908750532762193304) -->
+    <!-- no translation found for usage_stats_display_order_types:2 (1213951670006606353) -->
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 20d1e2c..6df792b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -16,9 +16,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="device_info_default">"Sconosciuto"</string>
-    <string name="device_info_uptime">"Tempo di attività"</string>
-    <string name="device_info_awaketime">"Tempo di attività"</string>
-    <string name="device_info_asleeptime">"Tempo di inattività"</string>
     <string name="turn_on_radio">"Accendi radio"</string>
     <string name="turn_off_radio">"Disattiva radio"</string>
     <string name="turn_on_qxdm">"Attiva log SD QXDM"</string>
@@ -52,14 +49,13 @@
     <string name="radioInfo_lac">"LAC"</string>
     <string name="radioInfo_cid">"CID"</string>
     <string name="sdcard_unmount">"Smonta scheda SD"</string>
+    <!-- no translation found for sdcard_format (362497552060004057) -->
+    <skip />
     <string name="small_font">"Piccole"</string>
     <string name="medium_font">"Medie"</string>
     <string name="large_font">"Grandi"</string>
     <string name="font_size_save">"OK"</string>
     <string name="sdcard_setting">"Scheda SD"</string>
-    <string name="screen_off_timeout_label">"Mai timeout quando sotto carica"</string>
-    <string name="stay_on">"Schermo sempre attivo quando sotto carica"</string>
-    <string name="app_launcher_newView_text">"Nuovo AppLauncher"</string>
     <string name="battery_info_status_label">"Stato batteria:"</string>
     <string name="battery_info_scale_label">"Scala batteria:"</string>
     <string name="battery_info_level_label">"Livello batteria:"</string>
@@ -87,11 +83,6 @@
     <string name="battery_info_health_over_voltage">"Sovratensione"</string>
     <string name="battery_info_health_unspecified_failure">"Errore sconosciuto"</string>
     <string name="bluetooth">"Bluetooth"</string>
-    <string name="bluetooth_stopping">"Interruzione Bluetooth..."</string>
-    <string name="bluetooth_disabled">"Attiva Bluetooth"</string>
-    <!-- no translation found for bluetooth_enabled (314506563815464155) -->
-    <skip />
-    <string name="bluetooth_enabling">"Attivazione Bluetooth…"</string>
     <string name="bluetooth_visibility">"Rilevabile"</string>
     <string name="bluetooth_is_discoverable">"Rilevabile per <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> secondi..."</string>
     <string name="bluetooth_not_discoverable">"Rendi rilevabile il dispositivo"</string>
@@ -99,7 +90,6 @@
     <string name="bluetooth_device_name">"Nome dispositivo"</string>
     <string name="bluetooth_name_not_set">"Nessun nome impostato, utilizzando il nome dell\'account"</string>
     <string name="bluetooth_scan_for_devices">"Cerca dispositivi"</string>
-    <string name="bluetooth_clear_list">"Cancella elenco dispositivi"</string>
     <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verrà disconnesso."</string>
     <string name="bluetooth_connected">"Connesso"</string>
     <string name="bluetooth_disconnected">"Disconnesso"</string>
@@ -108,17 +98,9 @@
     <!-- no translation found for bluetooth_unknown (644716244548801421) -->
     <skip />
     <string name="bluetooth_not_connected">"Accoppia con il dispositivo"</string>
-    <string name="bluetooth_failed_to_enable">"Impossibile attivare Bluetooth"</string>
     <string name="bluetooth_pairing">"Accoppiamento..."</string>
-    <string name="failed_to_pair">"Impossibile eseguire l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="failed_to_connect">"Impossibile connettersi a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_paired">"Accoppiato"</string>
-    <string name="bluetooth_paired_not_nearby">"Accoppiato"</string>
     <string name="bluetooth_device">"vivavoce/auricolare"</string>
-    <string name="bluetooth_disconnect">"Disconnetti"</string>
-    <string name="bluetooth_connect">"Connetti"</string>
-    <string name="bluetooth_unpair">"Disaccoppia"</string>
-    <string name="bluetooth_pair">"Accoppia"</string>
     <string name="progress_scanning">"Ricerca"</string>
     <string name="bluetooth_notif_ticker">"Richiesta accoppiamento Bluetooth"</string>
     <string name="bluetooth_notif_title">"Richiesta accoppiamento"</string>
@@ -136,16 +118,6 @@
     <string name="intent_sender_startactivity_text">"Inizia <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label">"Account:"</string>
-    <string name="keyguard_pw_mod_text">"Seleziona sequenza di blocco"</string>
-    <string name="keyguard_pin_mod_text">"Cambia PIN"</string>
-    <string name="keyguard_label">"Coperchio"</string>
-    <string name="keyguard_sim_pin_label">"PIN della SIM"</string>
-    <string name="keyguard_password_old_password_error_text">"La vecchia password digitata è errata. Riprova."</string>
-    <string name="keyguard_password_button_text">"OK"</string>
-    <string name="keyguard_password_confirm_new_label">"Conferma nuova password:"</string>
-    <string name="keyguard_password_new_label">"Nuova password:"</string>
-    <string name="keyguard_password_old_label">"Vecchia password:"</string>
-    <string name="keyguard_password_mismatch_error_text">"Le due password non corrispondono. Digitale di nuovo."</string>
     <string name="proxy_clear_text">"Cancella"</string>
     <string name="proxy_port_label">"Porta"</string>
     <string name="proxy_defaultView_text">"Ripristina predefinite"</string>
@@ -188,15 +160,13 @@
     <string name="radio_info_smsc_label">"SMSC:"</string>
     <string name="radio_info_smsc_update_label">"Aggiorna"</string>
     <string name="radio_info_smsc_refresh_label">"Aggiorna"</string>
+    <!-- no translation found for radio_info_toggle_dns_check_label (8292252930563286858) -->
+    <skip />
     <string name="band_mode_title">"Imposta banda GSM/UMTS"</string>
     <string name="band_mode_loading">"Caricamento lista bande..."</string>
     <string name="band_mode_set">"Imposta"</string>
     <string name="band_mode_failed">"Non riuscita"</string>
     <string name="band_mode_succeeded">"Riuscita"</string>
-    <string name="ringer_volume_ringer_mode_label">"Modalità suoneria"</string>
-    <string name="ringer_volume_screen_increasing_text">"Suoneria crescente"</string>
-    <string name="ringer_volume_ringtone_label">"Suoneria"</string>
-    <string name="ringer_volume_instructions">"Usa i pulsanti del volume per regolare la suoneria"</string>
     <string name="sdcard_changes_instructions">"Le modifiche saranno effettive alla riconnessione del cavo USB"</string>
     <string name="sdcard_settings_screen_mass_storage_text">"Attiva archiviazione di massa USB"</string>
     <string name="sdcard_settings_total_bytes_label">"Byte totali:"</string>
@@ -208,20 +178,6 @@
     <string name="sdcard_settings_used_bytes_label">"Byte utilizzati:"</string>
     <string name="sdcard_settings_scanning_status">"Ricerca di media nella scheda SD..."</string>
     <string name="sdcard_settings_read_only_status">"La scheda SD montata è di sola lettura"</string>
-    <string name="sdcard_removal_alert_title">"Rimozione scheda SD non sicura."</string>
-    <string name="sdcard_unmountable_alert_title">"Scheda SD non leggibile"</string>
-    <string name="telephony_user_label">"Utente:"</string>
-    <string name="telephony_server_label">"Server:"</string>
-    <string name="telephony_name_label">"Nome:"</string>
-    <string name="telephony_mmsc_label">"MMSC:"</string>
-    <string name="telephony_apn_label">"APN:"</string>
-    <string name="telephony_mcc_label">"MCC:"</string>
-    <string name="telephony_port_label">"Porta:"</string>
-    <string name="telephony_password_label">"Password:"</string>
-    <string name="telephony_proxy_label">"Proxy:"</string>
-    <string name="telephony_mnc_label">"MNC:"</string>
-    <string name="telephony_mmsproxy_label">"Proxy MMS:"</string>
-    <string name="telephony_mmsport_label">"Porta MMS:"</string>
     <string name="next_label">"Avanti"</string>
     <string name="language_picker_title">"Impostazioni internazionali"</string>
     <string name="select_your_language">"Seleziona la lingua"</string>
@@ -264,23 +220,12 @@
     <string name="bluetooth_settings_summary">"Gestisci le connessioni, imposta il nome e la rilevabilità del dispositivo"</string>
     <string name="bluetooth_pin_entry">"Richiesta accoppiamento Bluetooth"</string>
     <string name="bluetooth_device_info">"Info dispositivo Bluetooth"</string>
-    <string name="bluetooth_pairing_msg">"Accoppiamento..."</string>
     <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Digita il PIN per l\'accoppiamento."\n"Prova a usare 0000 o 1234."</string>
     <string name="bluetooth_error_title">"Attenzione"</string>
     <string name="bluetooth_pairing_error_message">"Errore durante l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_alternate_error_message">"Errore durante l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Prova a usare un altro PIN."</string>
     <string name="bluetooth_pairing_pin_error_message">"Errore durante l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Il PIN digitato è errato."</string>
     <string name="bluetooth_connecting_error_message">"Errore durante la connessione a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_new_data">"Digita i nuovi dati"</string>
-    <string name="bluetooth_new_data_confirm">"OK"</string>
-    <string name="bluetooth_new_data_cancel">"Annulla"</string>
-    <string name="bluetooth_scan_for_new_devices">"Ricerca di nuovi dispositivi..."</string>
-    <string name="bluetooth_discoverability_panel_title">"Rendimi..."</string>
-    <string name="bluetooth_discoverable">"Rilevabile per <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> secondi"</string>
-    <string name="bluetooth_connectable">"Solo collegabile"</string>
-    <string name="bluetooth_neither">"Non rilevabile e non collegabile"</string>
     <string name="bluetooth_preference_scan_title">"Cerca dispositivi"</string>
-    <string name="bluetooth_preference_scan_summary">"Trova dispositivi per accoppiamento"</string>
     <string name="bluetooth_device_context_connect">"Connetti"</string>
     <string name="bluetooth_device_context_disconnect">"Disconnetti"</string>
     <string name="bluetooth_device_context_pair_connect">"Accoppia e connetti"</string>
@@ -420,32 +365,24 @@
     <string name="sound_effects_enable_title">"Selezione sonora"</string>
     <string name="sound_effects_enable_summary_on">"Riproduci toni durante una selezione sullo schermo"</string>
     <string name="sound_effects_enable_summary_off">"Riproduci toni durante una selezione sullo schermo"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_title (1008791464029179529) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (426729807044947187) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (803791141563778934) -->
+    <skip />
     <string name="sync_settings">"Sincronizzazione dati"</string>
     <string name="sync_settings_summary">"Seleziona le applicazioni da sincronizzare"</string>
-    <string name="sync_settings_header_general_settings">"Impostazioni sincr. generali"</string>
-    <string name="sync_settings_header_application_settings">"Impostazioni sincr. applicazione"</string>
-    <string name="sync_too_many_deletes">"Limite di eliminazioni superato"</string>
-    <string name="sync_automatically">"Sincronizzazione automatica"</string>
-    <string name="sync_enabled">"Sincronizza i dati automaticamente"</string>
-    <string name="sync_disabled">"Seleziona per sincronizzare i dati automaticamente"</string>
-    <string name="sync_menu_sync_now">"Sincronizza ora"</string>
-    <string name="sync_menu_sync_cancel">"Annulla sincronizzazione"</string>
-    <string name="sync_gmail">"Gmail"</string>
-    <string name="sync_calendar">"Calendario"</string>
-    <string name="sync_contacts">"Contatti"</string>
-    <string name="sync_too_many_deletes_desc">"Esistono <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> elementi eliminati per <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>, account <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>. Specifica l\'operazione da eseguire."</string>
-    <string name="sync_really_delete">"Elimina gli elementi."</string>
-    <string name="sync_undo_deletes">"Annulla le eliminazioni."</string>
-    <string name="sync_do_nothing">"Non fare nulla per ora."</string>
-    <string name="sync_is_failing">"La sincronizzazione presenta dei problemi. L\'operazione verrà presto ripristinata."</string>
-    <string name="sync_plug"><font fgcolor="#ffffffff">"Benvenuto in Google Sync."</font>" "\n"L\'approccio di Google alla sincronizzazione di dati per consentirti l\'accesso ai tuoi contatti, appuntamenti e altro ancora, dovunque tu sia."</string>
     <string name="display_settings">"Impostazioni display"</string>
     <string name="animations_title">"Animazione"</string>
     <string name="animations_summary_on">"Mostra animazioni durante apertura/chiusura di finestre"</string>
     <string name="animations_summary_off">"Mostra animazioni durante apertura/chiusura di finestre"</string>
     <string name="brightness">"Luminosità"</string>
+    <!-- no translation found for brightness_summary (838917350127550703) -->
+    <skip />
     <string name="screen_timeout">"Timeout schermo"</string>
-    <string name="dim_screen">"Oscura schermo"</string>
+    <!-- no translation found for screen_timeout_summary (2905757633140605334) -->
+    <skip />
     <string name="sim_lock_settings">"Impostazioni blocco SIM"</string>
     <string name="sim_lock_settings_category">"Configurazione blocco SIM"</string>
     <string name="sim_lock_settings_title">"Blocco della SIM"</string>
@@ -493,13 +430,24 @@
     <string name="status_wifi_mac_address">"Indirizzo MAC Wi-Fi"</string>
     <string name="status_bt_address">"Indirizzo Bluetooth"</string>
     <string name="status_unavailable">"Non disponibile"</string>
+    <!-- no translation found for status_network_traffic_stats (2089739529980224804) -->
+    <skip />
+    <!-- no translation found for status_network_traffic_summary (1456797220417923108) -->
+    <skip />
     <string name="status_up_time">"Tempo di attività"</string>
     <string name="status_awake_time">"Tempo di attività"</string>
     <string name="internal_memory">"Archiviazione interna telefono"</string>
     <string name="sd_memory">"Scheda SD"</string>
     <string name="memory_available">"Spazio disponibile"</string>
     <string name="memory_size">"Spazio totale"</string>
-    <string name="sd_eject">"Smonta/espelli scheda SD"</string>
+    <!-- no translation found for sd_eject (6915293408836853020) -->
+    <skip />
+    <!-- no translation found for sd_eject_summary (3315557796211542962) -->
+    <skip />
+    <!-- no translation found for sd_format (5448738337382712203) -->
+    <skip />
+    <!-- no translation found for sd_format_summary (6616491027883134004) -->
+    <skip />
     <string name="sd_unavailable">"Non disponibile"</string>
     <string name="read_only">"(Sola lettura)"</string>
     <string name="battery_status_title">"Stato batteria"</string>
@@ -538,6 +486,22 @@
     <string name="master_clear_gesture_prompt">"Inserisci la sequenza di sblocco"</string>
     <string name="master_clear_gesture_explanation">"Per confermare un ripristino del telefono occorre inserire la sequenza di sblocco."</string>
     <string name="master_clear_failed">"Nessun ripristino eseguito perché il servizio System Clear non è disponibile."</string>
+    <!-- no translation found for media_format_title (4671276096695789895) -->
+    <skip />
+    <!-- no translation found for media_format_summary (3805714639375830120) -->
+    <skip />
+    <!-- no translation found for media_format_desc (1142563222357820834) -->
+    <skip />
+    <!-- no translation found for media_format_button_text (370856400090190151) -->
+    <skip />
+    <!-- no translation found for media_format_final_desc (1776666694910717198) -->
+    <skip />
+    <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_prompt (3109349468816856670) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_explanation (4239529439389660159) -->
+    <skip />
     <string name="call_settings_title">"Impostazioni chiamate"</string>
     <string name="call_settings_summary">"Imposta segreteria, deviazione chiamate, avviso di chiamata, ID chiamante"</string>
     <string name="network_settings_title">"Reti mobili"</string>
@@ -591,17 +555,25 @@
     <string name="lock_example_title">"Sequenza di esempio"</string>
     <string name="lock_example_message">"Collega almeno quattro punti."\n" "\n"Seleziona \"Avanti\" quando sei pronto a creare la tua sequenza."</string>
     <string name="manageapplications_settings_title">"Gestisci applicazioni"</string>
+    <!-- no translation found for manageapplications_settings_summary (6097117021500651232) -->
+    <skip />
     <string name="applications_settings">"Applicazioni"</string>
     <string name="applications_settings_summary">"Gestisci le applicazioni, imposta i collegamenti di avvio rapido"</string>
     <string name="applications_settings_header">"Impostazioni applicazione"</string>
     <string name="install_applications">"Origini sconosciute"</string>
     <string name="install_unknown_applications">"Consenti l\'installazione di applicazioni non commerciali"</string>
     <string name="install_all_warning">"Il telefono e i dati personali sono più vulnerabili agli attacchi da parte di applicazioni\n di origini sconosciute. L\'utente accetta di essere il solo responsabile degli eventuali\n danni al telefono o della perdita dei dati che potrebbero derivare dall\'utilizzo di\n queste applicazioni."</string>
-    <string name="manage_applications_title">"Gestisci applicazioni"</string>
     <string name="application_info_label">"Info applicazione"</string>
     <string name="storage_label">"Archiviazione"</string>
     <string name="auto_launch_label">"Avvia per impostazione predefinita"</string>
     <string name="permissions_label">"Autorizzazioni"</string>
+    <string name="cache_header_label">"Cache"</string>
+    <string name="clear_cache_btn_text">"Cancella cache"</string>
+    <string name="cache_size_label">"Cache"</string>
+    <!-- no translation found for controls_label (7611113077086853799) -->
+    <skip />
+    <!-- no translation found for force_stop (7435006169872876756) -->
+    <skip />
     <string name="total_size_label">"Totale"</string>
     <string name="application_size_label">"Applicazione"</string>
     <string name="data_size_label">"Dati"</string>
@@ -614,6 +586,10 @@
     <string name="sort_order_alpha">"Ordina"</string>
     <string name="sort_order_size">"Ordina per dimensioni"</string>
     <string name="manage_space_text">"Gestisci spazio"</string>
+    <!-- no translation found for filter (2018011724373033887) -->
+    <skip />
+    <!-- no translation found for filter_dlg_title (6507663329723966854) -->
+    <skip />
     <string name="filter_apps_all">"Tutte"</string>
     <string name="filter_apps_third_party">"Terze parti"</string>
     <string name="filter_apps_running">"In esecuzione"</string>
@@ -627,22 +603,24 @@
     <string name="app_not_found_dlg_text">"Impossibile trovare l\'applicazione \nnell\'elenco di applicazioni installate."</string>
     <string name="clear_data_failed">"Impossibile cancellare i dati dell\'applicazione."</string>
     <string name="security_settings_desc">"Contenuto a cui può accedere l\'applicazione sul telefono:"</string>
-    <string name="computing_size">"Calcolo ancora in corso"</string>
+    <!-- no translation found for computing_size (1599186977475211186) -->
+    <skip />
     <string name="invalid_size_value">"Impossibile stabilire le dimensioni del pacchetto"</string>
     <string name="empty_list_msg">"Nessuna applicazione di terze parti installata."</string>
-    <string name="cache_header_label">"Cache"</string>
-    <string name="clear_cache_btn_text">"Cancella cache"</string>
-    <string name="cache_size_label">"Cache"</string>
     <string name="language_settings">"Impostazioni internazionali e testo"</string>
     <string name="language_settings_summary">"Imposta opzioni internazionali (lingua e regione), di inserimento e correzione automatica del testo"</string>
     <string name="language_category">"Impostazione locale"</string>
     <string name="text_category">"Impostazioni testo"</string>
     <string name="phone_language">"Seleziona impost. internaz."</string>
+    <!-- no translation found for phone_language_summary (1809580675831352352) -->
+    <skip />
     <string name="auto_replace">"Sostituzione automatica"</string>
     <string name="auto_replace_summary">"Corregge le parole con errori di ortografia"</string>
     <string name="auto_caps">"Maiuscola automatica"</string>
     <string name="auto_caps_summary">"Usa la maiuscola a inizio frase"</string>
     <string name="auto_punctuate">"Punteggiatura automatica"</string>
+    <!-- no translation found for hardkeyboard_category (5957168411305769899) -->
+    <skip />
     <string name="auto_punctuate_summary">"Premi due volte la barra spaziatrice per inserire \".\""</string>
     <string name="show_password">"Password visibili"</string>
     <string name="show_password_summary">"Mostra la password durante la digitazione"</string>
@@ -690,4 +668,68 @@
     <string name="keep_screen_on_summary">"Lo schermo non diventa mai inattivo sotto carica"</string>
     <string name="allow_mock_location">"Consenti posizioni fittizie"</string>
     <string name="allow_mock_location_summary">"Consenti posizioni fittizie"</string>
+    <!-- no translation found for battery_history_known_apps (6907374478255786240) -->
+    <skip />
+    <!-- no translation found for gadget_picker_title (4335873961457985189) -->
+    <skip />
+    <!-- no translation found for battery_history_details_for (5189636461798594740) -->
+    <skip />
+    <!-- no translation found for battery_history_uid (1016606150528436298) -->
+    <skip />
+    <!-- no translation found for battery_history_network_usage (8010852371665217020) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_received (980307569180518302) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_sent (2501748768602119159) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_total (4444807574361642753) -->
+    <skip />
+    <!-- no translation found for battery_history_cpu_usage (2597353713014790877) -->
+    <skip />
+    <!-- no translation found for battery_history_user_time (6227507614894791359) -->
+    <skip />
+    <!-- no translation found for battery_history_system_time (2015862072724507547) -->
+    <skip />
+    <!-- no translation found for battery_history_total_time (3618703970098556104) -->
+    <skip />
+    <!-- no translation found for battery_history_starts (9137453931978571696) -->
+    <skip />
+    <!-- no translation found for battery_history_days (6387593985264923377) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (2593055276272350197) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (5608990219891318138) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (7397664460929461350) -->
+    <skip />
+    <!-- no translation found for battery_history_packages_sharing_this_uid (4101596071379250050) -->
+    <skip />
+    <!-- no translation found for battery_history_no_data (1177238743237067617) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor (2333488996028993982) -->
+    <skip />
+    <!-- no translation found for battery_history_used_by_packages (3000711380023436470) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage (3593133338613209024) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage_multi (4536084375991014508) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on (1377240025275657277) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_battery (536058210445081888) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_plugged (5019127390021871260) -->
+    <skip />
+    <!-- no translation found for usage_stats_label (5890846333487083609) -->
+    <skip />
+    <!-- no translation found for testing_usage_stats (7823048598893937339) -->
+    <skip />
+    <!-- no translation found for display_order_text (8592776965827565271) -->
+    <skip />
+    <!-- no translation found for app_name_label (2000949925256858308) -->
+    <skip />
+    <!-- no translation found for launch_count_label (4019444833263957024) -->
+    <skip />
+    <!-- no translation found for usage_time_label (295954901452833058) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 018a972..aab5983 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -53,4 +53,15 @@
     <!-- no translation found for wifi_sleep_policy_entries:0 (3804733751095821976) -->
     <!-- no translation found for wifi_sleep_policy_entries:1 (1549288661423279207) -->
     <!-- no translation found for wifi_sleep_policy_entries:2 (1986753720941888596) -->
+    <!-- no translation found for battery_history_type_spinner:0 (2372160040893842611) -->
+    <!-- no translation found for battery_history_type_spinner:1 (7042951832385599110) -->
+    <!-- no translation found for battery_history_type_spinner:2 (7643330117743172161) -->
+    <!-- no translation found for battery_history_type_spinner:3 (7984071435080498080) -->
+    <!-- no translation found for battery_history_which_spinner:0 (8777827398176661463) -->
+    <!-- no translation found for battery_history_which_spinner:1 (2351620008414691945) -->
+    <!-- no translation found for battery_history_which_spinner:2 (1233325583071371898) -->
+    <!-- no translation found for battery_history_which_spinner:3 (524850874274605031) -->
+    <!-- no translation found for usage_stats_display_order_types:0 (9077371706468756228) -->
+    <!-- no translation found for usage_stats_display_order_types:1 (1908750532762193304) -->
+    <!-- no translation found for usage_stats_display_order_types:2 (1213951670006606353) -->
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 06accea..5a5be04 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -16,9 +16,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="device_info_default">"不明"</string>
-    <string name="device_info_uptime">"起動時間"</string>
-    <string name="device_info_awaketime">"使用時間"</string>
-    <string name="device_info_asleeptime">"スリープ時間"</string>
     <string name="turn_on_radio">"無線通信をオン"</string>
     <string name="turn_off_radio">"無線通信をオフ"</string>
     <string name="turn_on_qxdm">"QXDM SDログを有効にする"</string>
@@ -52,14 +49,13 @@
     <string name="radioInfo_lac">"LAC"</string>
     <string name="radioInfo_cid">"CID"</string>
     <string name="sdcard_unmount">"SDカードのマウント解除"</string>
+    <!-- no translation found for sdcard_format (362497552060004057) -->
+    <skip />
     <string name="small_font">"小"</string>
     <string name="medium_font">"中"</string>
     <string name="large_font">"大"</string>
     <string name="font_size_save">"OK"</string>
     <string name="sdcard_setting">"SDカード"</string>
-    <string name="screen_off_timeout_label">"充電中はタイムアウトにしない"</string>
-    <string name="stay_on">"充電中に画面をスリープにしない"</string>
-    <string name="app_launcher_newView_text">"新しいAppLauncher"</string>
     <string name="battery_info_status_label">"バッテリステータス:"</string>
     <string name="battery_info_scale_label">"バッテリ残量表示:"</string>
     <string name="battery_info_level_label">"バッテリレベル:"</string>
@@ -87,11 +83,6 @@
     <string name="battery_info_health_over_voltage">"過電圧"</string>
     <string name="battery_info_health_unspecified_failure">"不明なエラー"</string>
     <string name="bluetooth">"Bluetooth"</string>
-    <string name="bluetooth_stopping">"Bluetoothを停止中..."</string>
-    <string name="bluetooth_disabled">"Bluetoothをオン"</string>
-    <!-- no translation found for bluetooth_enabled (314506563815464155) -->
-    <skip />
-    <string name="bluetooth_enabling">"Bluetoothをオンにしています..."</string>
     <string name="bluetooth_visibility">"検出可能"</string>
     <string name="bluetooth_is_discoverable">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>秒間検出可能..."</string>
     <string name="bluetooth_not_discoverable">"デバイスを検出可能にする"</string>
@@ -99,7 +90,6 @@
     <string name="bluetooth_device_name">"デバイス名"</string>
     <string name="bluetooth_name_not_set">"名前が設定されていない場合、アカウント名を使用する"</string>
     <string name="bluetooth_scan_for_devices">"デバイスのスキャン"</string>
-    <string name="bluetooth_clear_list">"デバイスリストをクリア"</string>
     <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>の接続を解除します"</string>
     <string name="bluetooth_connected">"接続"</string>
     <string name="bluetooth_disconnected">"切断"</string>
@@ -108,17 +98,9 @@
     <!-- no translation found for bluetooth_unknown (644716244548801421) -->
     <skip />
     <string name="bluetooth_not_connected">"このデバイスをペアに設定する"</string>
-    <string name="bluetooth_failed_to_enable">"Bluetoothをオンにできません"</string>
     <string name="bluetooth_pairing">"ペアとして設定中..."</string>
-    <string name="failed_to_pair">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>をペアとして設定できません"</string>
-    <string name="failed_to_connect">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>に接続できません"</string>
     <string name="bluetooth_paired">"ペア設定"</string>
-    <string name="bluetooth_paired_not_nearby">"ペア設定"</string>
     <string name="bluetooth_device">"ハンズフリー/ヘッドセット"</string>
-    <string name="bluetooth_disconnect">"接続を解除"</string>
-    <string name="bluetooth_connect">"接続"</string>
-    <string name="bluetooth_unpair">"ペアを解除"</string>
-    <string name="bluetooth_pair">"ペアに設定"</string>
     <string name="progress_scanning">"スキャン中"</string>
     <string name="bluetooth_notif_ticker">"Bluetoothペア設定リクエスト"</string>
     <string name="bluetooth_notif_title">"ペア設定リクエスト"</string>
@@ -136,16 +118,6 @@
     <string name="intent_sender_startactivity_text">"<xliff:g id="ACTIVITY">activity</xliff:g>を開始"</string>
     <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label">"アカウント:"</string>
-    <string name="keyguard_pw_mod_text">"ロックパターンの選択"</string>
-    <string name="keyguard_pin_mod_text">"PINの変更"</string>
-    <string name="keyguard_label">"キーガード"</string>
-    <string name="keyguard_sim_pin_label">"SIM PIN"</string>
-    <string name="keyguard_password_old_password_error_text">"入力した古いパスワードは正しくありません。再入力してください。"</string>
-    <string name="keyguard_password_button_text">"OK"</string>
-    <string name="keyguard_password_confirm_new_label">"新しいパスワードの確認入力:"</string>
-    <string name="keyguard_password_new_label">"新しいパスワード:"</string>
-    <string name="keyguard_password_old_label">"古いパスワード:"</string>
-    <string name="keyguard_password_mismatch_error_text">"2つのパスワードが一致しません。再入力してください。"</string>
     <string name="proxy_clear_text">"クリア"</string>
     <string name="proxy_port_label">"ポート"</string>
     <string name="proxy_defaultView_text">"デフォルトに戻す"</string>
@@ -188,15 +160,13 @@
     <string name="radio_info_smsc_label">"SMSC:"</string>
     <string name="radio_info_smsc_update_label">"更新"</string>
     <string name="radio_info_smsc_refresh_label">"更新"</string>
+    <!-- no translation found for radio_info_toggle_dns_check_label (8292252930563286858) -->
+    <skip />
     <string name="band_mode_title">"GSM/UMTSバンドの設定"</string>
     <string name="band_mode_loading">"バンドリストを読み込み中..."</string>
     <string name="band_mode_set">"設定"</string>
     <string name="band_mode_failed">"失敗"</string>
     <string name="band_mode_succeeded">"成功"</string>
-    <string name="ringer_volume_ringer_mode_label">"着信音のモード"</string>
-    <string name="ringer_volume_screen_increasing_text">"音量を徐々にアップ"</string>
-    <string name="ringer_volume_ringtone_label">"着信音"</string>
-    <string name="ringer_volume_instructions">"音量ボタンで着信音の音量を調整します"</string>
     <string name="sdcard_changes_instructions">"USBケーブルの再接続時に変更が有効になります"</string>
     <string name="sdcard_settings_screen_mass_storage_text">"USBマスストレージを有効にする"</string>
     <string name="sdcard_settings_total_bytes_label">"合計バイト数:"</string>
@@ -208,20 +178,6 @@
     <string name="sdcard_settings_used_bytes_label">"使用済みバイト数:"</string>
     <string name="sdcard_settings_scanning_status">"メディア用のSDカードをスキャン中..."</string>
     <string name="sdcard_settings_read_only_status">"読み取り専用としてSDカードをマウントしました"</string>
-    <string name="sdcard_removal_alert_title">"安全でないSDカードの取り外し"</string>
-    <string name="sdcard_unmountable_alert_title">"SDカードが読み取れません"</string>
-    <string name="telephony_user_label">"ユーザー:"</string>
-    <string name="telephony_server_label">"サーバー:"</string>
-    <string name="telephony_name_label">"名前:"</string>
-    <string name="telephony_mmsc_label">"MMSC:"</string>
-    <string name="telephony_apn_label">"APN:"</string>
-    <string name="telephony_mcc_label">"MCC:"</string>
-    <string name="telephony_port_label">"ポート:"</string>
-    <string name="telephony_password_label">"パスワード:"</string>
-    <string name="telephony_proxy_label">"プロキシ:"</string>
-    <string name="telephony_mnc_label">"MNC:"</string>
-    <string name="telephony_mmsproxy_label">"MMSプロキシ:"</string>
-    <string name="telephony_mmsport_label">"MMSポート:"</string>
     <string name="next_label">"次へ"</string>
     <string name="language_picker_title">"ロケール"</string>
     <string name="select_your_language">"言語を選択"</string>
@@ -264,23 +220,12 @@
     <string name="bluetooth_settings_summary">"接続を管理、デイバイス名を設定、検出可能に設定"</string>
     <string name="bluetooth_pin_entry">"Bluetoothペア設定リクエスト"</string>
     <string name="bluetooth_device_info">"Bluetoothデバイス情報"</string>
-    <string name="bluetooth_pairing_msg">"ペアとして設定中..."</string>
     <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"ペアにするPINを入力してください。"\n"(0000か1234を試してください)"</string>
     <string name="bluetooth_error_title">"注意"</string>
     <string name="bluetooth_pairing_error_message">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>とのペアリングで問題が発生しました。"</string>
-    <string name="bluetooth_pairing_alternate_error_message">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>とのペアリングで問題が発生しました。他のPINを指定してください。"</string>
     <string name="bluetooth_pairing_pin_error_message">"入力されたPINが正しくないため、<xliff:g id="DEVICE_NAME">%1$s</xliff:g>とのペアリングで問題が発生しました。"</string>
     <string name="bluetooth_connecting_error_message">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>への接続で問題が発生しました。"</string>
-    <string name="bluetooth_new_data">"新しいデータの入力"</string>
-    <string name="bluetooth_new_data_confirm">"OK"</string>
-    <string name="bluetooth_new_data_cancel">"キャンセル"</string>
-    <string name="bluetooth_scan_for_new_devices">"新しいデバイスのスキャン中..."</string>
-    <string name="bluetooth_discoverability_panel_title">"携帯電話側で設定..."</string>
-    <string name="bluetooth_discoverable">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>秒間検出可能"</string>
-    <string name="bluetooth_connectable">"接続可能時のみ"</string>
-    <string name="bluetooth_neither">"検出できないか、接続できません"</string>
     <string name="bluetooth_preference_scan_title">"デバイスのスキャン"</string>
-    <string name="bluetooth_preference_scan_summary">"ペアとして設定するデバイスを検出"</string>
     <string name="bluetooth_device_context_connect">"接続"</string>
     <string name="bluetooth_device_context_disconnect">"接続を解除"</string>
     <string name="bluetooth_device_context_pair_connect">"ペアに設定して接続"</string>
@@ -420,32 +365,24 @@
     <string name="sound_effects_enable_title">"選択の効果音"</string>
     <string name="sound_effects_enable_summary_on">"画面での選択時に音を鳴らす"</string>
     <string name="sound_effects_enable_summary_off">"画面での選択時に音を鳴らす"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_title (1008791464029179529) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (426729807044947187) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (803791141563778934) -->
+    <skip />
     <string name="sync_settings">"データの同期化"</string>
     <string name="sync_settings_summary">"同期するアプリケーションを選択"</string>
-    <string name="sync_settings_header_general_settings">"同期の全般設定"</string>
-    <string name="sync_settings_header_application_settings">"アプリケーションの同期設定"</string>
-    <string name="sync_too_many_deletes">"削除の制限を超えました"</string>
-    <string name="sync_automatically">"自動同期化"</string>
-    <string name="sync_enabled">"自動的にデータを同期"</string>
-    <string name="sync_disabled">"自動的にデータを同期"</string>
-    <string name="sync_menu_sync_now">"今すぐ同期"</string>
-    <string name="sync_menu_sync_cancel">"同期をキャンセル"</string>
-    <string name="sync_gmail">"Gmail"</string>
-    <string name="sync_calendar">"カレンダー"</string>
-    <string name="sync_contacts">"連絡先"</string>
-    <string name="sync_too_many_deletes_desc">"アカウント「<xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>」で<xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>の<xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g>個の項目が削除されています。処理を選択してください。"</string>
-    <string name="sync_really_delete">"項目を削除します。"</string>
-    <string name="sync_undo_deletes">"削除を元に戻します。"</string>
-    <string name="sync_do_nothing">"今は何もしません。"</string>
-    <string name="sync_is_failing">"現在同期で問題が発生しています。しばらくお待ちください。"</string>
-    <string name="sync_plug"><font fgcolor="#ffffffff">"Google Syncへようこそ"</font>" "\n"このサービスを使用すると、データを同期して、どこからでも連絡先や予定などにアクセスできます。"</string>
     <string name="display_settings">"表示設定"</string>
     <string name="animations_title">"アニメーション"</string>
     <string name="animations_summary_on">"ウィンドウのオープン/クローズ時にアニメーションを表示"</string>
     <string name="animations_summary_off">"ウィンドウのオープン/クローズ時にアニメーションを表示"</string>
     <string name="brightness">"輝度"</string>
+    <!-- no translation found for brightness_summary (838917350127550703) -->
+    <skip />
     <string name="screen_timeout">"画面のタイムアウト"</string>
-    <string name="dim_screen">"画面を暗くする"</string>
+    <!-- no translation found for screen_timeout_summary (2905757633140605334) -->
+    <skip />
     <string name="sim_lock_settings">"SIMカードのロック設定"</string>
     <string name="sim_lock_settings_category">"SIMカードのロックを設定"</string>
     <string name="sim_lock_settings_title">"SIMカードのロック"</string>
@@ -493,13 +430,24 @@
     <string name="status_wifi_mac_address">"Wi-Fi MACアドレス"</string>
     <string name="status_bt_address">"Bluetoothアドレス"</string>
     <string name="status_unavailable">"不明"</string>
+    <!-- no translation found for status_network_traffic_stats (2089739529980224804) -->
+    <skip />
+    <!-- no translation found for status_network_traffic_summary (1456797220417923108) -->
+    <skip />
     <string name="status_up_time">"稼働時間"</string>
     <string name="status_awake_time">"使用時間"</string>
     <string name="internal_memory">"携帯電話内部メモリ"</string>
     <string name="sd_memory">"SDカード"</string>
     <string name="memory_available">"空き容量"</string>
     <string name="memory_size">"合計容量"</string>
-    <string name="sd_eject">"SDカードをマウント解除/取り出す"</string>
+    <!-- no translation found for sd_eject (6915293408836853020) -->
+    <skip />
+    <!-- no translation found for sd_eject_summary (3315557796211542962) -->
+    <skip />
+    <!-- no translation found for sd_format (5448738337382712203) -->
+    <skip />
+    <!-- no translation found for sd_format_summary (6616491027883134004) -->
+    <skip />
     <string name="sd_unavailable">"使用不可"</string>
     <string name="read_only">"(読み取り専用)"</string>
     <string name="battery_status_title">"バッテリの状態"</string>
@@ -538,6 +486,22 @@
     <string name="master_clear_gesture_prompt">"ロック解除パターンを入力してください"</string>
     <string name="master_clear_gesture_explanation">"携帯電話をリセットするには、ロック解除パターンを入力する必要があります。"</string>
     <string name="master_clear_failed">"System Clearサービスが利用できないため、リセットされませんでした。"</string>
+    <!-- no translation found for media_format_title (4671276096695789895) -->
+    <skip />
+    <!-- no translation found for media_format_summary (3805714639375830120) -->
+    <skip />
+    <!-- no translation found for media_format_desc (1142563222357820834) -->
+    <skip />
+    <!-- no translation found for media_format_button_text (370856400090190151) -->
+    <skip />
+    <!-- no translation found for media_format_final_desc (1776666694910717198) -->
+    <skip />
+    <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_prompt (3109349468816856670) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_explanation (4239529439389660159) -->
+    <skip />
     <string name="call_settings_title">"通話設定"</string>
     <string name="call_settings_summary">"ボイスメール、電話転送、通話中着信、発信者番号を設定する"</string>
     <string name="network_settings_title">"モバイルネットワーク"</string>
@@ -591,17 +555,25 @@
     <string name="lock_example_title">"パターン例"</string>
     <string name="lock_example_message">"少なくとも4つの点を結びます。"\n" "\n"独自のパターンを考えたら、[次へ]を選択します。"</string>
     <string name="manageapplications_settings_title">"アプリケーションを管理"</string>
+    <!-- no translation found for manageapplications_settings_summary (6097117021500651232) -->
+    <skip />
     <string name="applications_settings">"アプリケーション"</string>
     <string name="applications_settings_summary">"アプリケーションを管理し、クイック起動のショートカットを設定する"</string>
     <string name="applications_settings_header">"アプリケーション設定"</string>
     <string name="install_applications">"不明な提供元"</string>
     <string name="install_unknown_applications">"Android Market以外のアプリケーションのインストールを許可する"</string>
     <string name="install_all_warning">"提供元が不明のアプリケーションから、携帯電話や個人データが攻撃を受ける可能性が高くなります。このようなアプリケーションの使用により生じた携帯電話への損害やデータの損失については、お客様がすべての責任を負うことに同意するものとします。"</string>
-    <string name="manage_applications_title">"アプリケーションを管理"</string>
     <string name="application_info_label">"アプリケーション情報"</string>
     <string name="storage_label">"メモリ"</string>
     <string name="auto_launch_label">"デフォルトで起動"</string>
     <string name="permissions_label">"許可"</string>
+    <string name="cache_header_label">"キャッシュ"</string>
+    <string name="clear_cache_btn_text">"キャッシュをクリア"</string>
+    <string name="cache_size_label">"キャッシュ"</string>
+    <!-- no translation found for controls_label (7611113077086853799) -->
+    <skip />
+    <!-- no translation found for force_stop (7435006169872876756) -->
+    <skip />
     <string name="total_size_label">"合計"</string>
     <string name="application_size_label">"アプリケーション"</string>
     <string name="data_size_label">"データ"</string>
@@ -614,6 +586,10 @@
     <string name="sort_order_alpha">"並べ替え"</string>
     <string name="sort_order_size">"サイズ順に並べ替え"</string>
     <string name="manage_space_text">"容量を管理"</string>
+    <!-- no translation found for filter (2018011724373033887) -->
+    <skip />
+    <!-- no translation found for filter_dlg_title (6507663329723966854) -->
+    <skip />
     <string name="filter_apps_all">"すべて"</string>
     <string name="filter_apps_third_party">"サードパーティ"</string>
     <string name="filter_apps_running">"実行中"</string>
@@ -627,22 +603,24 @@
     <string name="app_not_found_dlg_text">"インストール済みアプリケーションのリストに、このアプリケーションはありません。"</string>
     <string name="clear_data_failed">"アプリケーションデータを消去できませんでした。"</string>
     <string name="security_settings_desc">"このアプリケーションでアクセスできる携帯電話の項目:"</string>
-    <string name="computing_size">"計算中..."</string>
+    <!-- no translation found for computing_size (1599186977475211186) -->
+    <skip />
     <string name="invalid_size_value">"パッケージのサイズを計算できません"</string>
     <string name="empty_list_msg">"サードパーティ製のアプリケーションはインストールされていません。"</string>
-    <string name="cache_header_label">"キャッシュ"</string>
-    <string name="clear_cache_btn_text">"キャッシュをクリア"</string>
-    <string name="cache_size_label">"キャッシュ"</string>
     <string name="language_settings">"ロケールとテキスト"</string>
     <string name="language_settings_summary">"ロケール (言語と地域)、テキスト入力、自動修正オプションを設定する"</string>
     <string name="language_category">"ロケール設定"</string>
     <string name="text_category">"テキスト設定"</string>
     <string name="phone_language">"ロケールを選択"</string>
+    <!-- no translation found for phone_language_summary (1809580675831352352) -->
+    <skip />
     <string name="auto_replace">"自動修正"</string>
     <string name="auto_replace_summary">"誤字脱字を修正する"</string>
     <string name="auto_caps">"大文字の自動入力"</string>
     <string name="auto_caps_summary">"文の最初の文字を大文字にする"</string>
     <string name="auto_punctuate">"句読点を自動入力"</string>
+    <!-- no translation found for hardkeyboard_category (5957168411305769899) -->
+    <skip />
     <string name="auto_punctuate_summary">"Spaceキーを2回押して「。」を挿入"</string>
     <string name="show_password">"パスワードを表示"</string>
     <string name="show_password_summary">"入力中のパスワードを表示"</string>
@@ -690,4 +668,68 @@
     <string name="keep_screen_on_summary">"充電中に画面をスリープにしない"</string>
     <string name="allow_mock_location">"仮の位置情報を許可する"</string>
     <string name="allow_mock_location_summary">"仮の位置情報を許可する"</string>
+    <!-- no translation found for battery_history_known_apps (6907374478255786240) -->
+    <skip />
+    <!-- no translation found for gadget_picker_title (4335873961457985189) -->
+    <skip />
+    <!-- no translation found for battery_history_details_for (5189636461798594740) -->
+    <skip />
+    <!-- no translation found for battery_history_uid (1016606150528436298) -->
+    <skip />
+    <!-- no translation found for battery_history_network_usage (8010852371665217020) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_received (980307569180518302) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_sent (2501748768602119159) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_total (4444807574361642753) -->
+    <skip />
+    <!-- no translation found for battery_history_cpu_usage (2597353713014790877) -->
+    <skip />
+    <!-- no translation found for battery_history_user_time (6227507614894791359) -->
+    <skip />
+    <!-- no translation found for battery_history_system_time (2015862072724507547) -->
+    <skip />
+    <!-- no translation found for battery_history_total_time (3618703970098556104) -->
+    <skip />
+    <!-- no translation found for battery_history_starts (9137453931978571696) -->
+    <skip />
+    <!-- no translation found for battery_history_days (6387593985264923377) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (2593055276272350197) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (5608990219891318138) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (7397664460929461350) -->
+    <skip />
+    <!-- no translation found for battery_history_packages_sharing_this_uid (4101596071379250050) -->
+    <skip />
+    <!-- no translation found for battery_history_no_data (1177238743237067617) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor (2333488996028993982) -->
+    <skip />
+    <!-- no translation found for battery_history_used_by_packages (3000711380023436470) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage (3593133338613209024) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage_multi (4536084375991014508) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on (1377240025275657277) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_battery (536058210445081888) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_plugged (5019127390021871260) -->
+    <skip />
+    <!-- no translation found for usage_stats_label (5890846333487083609) -->
+    <skip />
+    <!-- no translation found for testing_usage_stats (7823048598893937339) -->
+    <skip />
+    <!-- no translation found for display_order_text (8592776965827565271) -->
+    <skip />
+    <!-- no translation found for app_name_label (2000949925256858308) -->
+    <skip />
+    <!-- no translation found for launch_count_label (4019444833263957024) -->
+    <skip />
+    <!-- no translation found for usage_time_label (295954901452833058) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
new file mode 100644
index 0000000..eb57527
--- /dev/null
+++ b/res/values-ko/arrays.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item>"미국"</item>
+    <item>"유럽"</item>
+    <item>"아프리카"</item>
+    <item>"아시아"</item>
+    <item>"오스트레일리아"</item>
+    <item>"태평양"</item>
+    <item>"모두"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item>"15초"</item>
+    <item>"30초"</item>
+    <item>"1분"</item>
+    <item>"2분"</item>
+    <item>"10분"</item>
+    <item>"시간제한 없음"</item>
+  </string-array>
+  <string-array name="wifi_security_entries">
+    <item>"자동"</item>
+    <item>"없음"</item>
+    <item>"WEP"</item>
+    <item>"WPA 개인"</item>
+    <item>"WPA2 개인"</item>
+  </string-array>
+  <string-array name="wifi_security_without_auto_entries">
+    <item>"없음"</item>
+    <item>"WEP"</item>
+    <item>"WPA 개인"</item>
+    <item>"WPA2 개인"</item>
+  </string-array>
+  <string-array name="wifi_wep_type">
+    <item>"자동"</item>
+    <item>"WEP ASCII"</item>
+    <item>"WEP 16진수"</item>
+  </string-array>
+    <!-- no translation found for wifi_sleep_policy_entries:0 (3804733751095821976) -->
+    <!-- no translation found for wifi_sleep_policy_entries:1 (1549288661423279207) -->
+    <!-- no translation found for wifi_sleep_policy_entries:2 (1986753720941888596) -->
+    <!-- no translation found for battery_history_type_spinner:0 (2372160040893842611) -->
+    <!-- no translation found for battery_history_type_spinner:1 (7042951832385599110) -->
+    <!-- no translation found for battery_history_type_spinner:2 (7643330117743172161) -->
+    <!-- no translation found for battery_history_type_spinner:3 (7984071435080498080) -->
+    <!-- no translation found for battery_history_which_spinner:0 (8777827398176661463) -->
+    <!-- no translation found for battery_history_which_spinner:1 (2351620008414691945) -->
+    <!-- no translation found for battery_history_which_spinner:2 (1233325583071371898) -->
+    <!-- no translation found for battery_history_which_spinner:3 (524850874274605031) -->
+    <!-- no translation found for usage_stats_display_order_types:0 (9077371706468756228) -->
+    <!-- no translation found for usage_stats_display_order_types:1 (1908750532762193304) -->
+    <!-- no translation found for usage_stats_display_order_types:2 (1213951670006606353) -->
+</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
new file mode 100644
index 0000000..c4cff10
--- /dev/null
+++ b/res/values-ko/strings.xml
@@ -0,0 +1,735 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="device_info_default">"알 수 없음"</string>
+    <string name="turn_on_radio">"무선 켜기"</string>
+    <string name="turn_off_radio">"무선 끄기"</string>
+    <string name="turn_on_qxdm">"QXDM SD 로그 사용"</string>
+    <string name="turn_off_qxdm">"QXDM SD 로그 사용 안 함"</string>
+    <string name="radioInfo_menu_viewADN">"SIM 주소록 보기"</string>
+    <string name="radioInfo_menu_viewFDN">"FDN(전화걸 수 있는 번호) 보기"</string>
+    <string name="radioInfo_menu_viewSDN">"SDN(Service Dialing Numbers) 보기"</string>
+    <string name="radioInfo_menu_getPDP">"PDP 목록 가져오기"</string>
+    <string name="radioInfo_menu_enableData">"데이터 연결 사용"</string>
+    <string name="radioInfo_menu_disableData">"데이터 연결 사용 안 함"</string>
+    <string name="radioInfo_menu_enableDataOnBoot">"부팅할 때 데이터 사용"</string>
+    <string name="radioInfo_menu_disableDataOnBoot">"부팅할 때 데이터 사용 안 함"</string>
+    <string name="radioInfo_service_in">"서비스 상태"</string>
+    <string name="radioInfo_service_out">"서비스 지역 벗어남"</string>
+    <string name="radioInfo_service_emergency">"비상 전화만"</string>
+    <string name="radioInfo_service_off">"무선 연결 끊김"</string>
+    <string name="radioInfo_roaming_in">"로밍"</string>
+    <string name="radioInfo_roaming_not">"로밍 안 함"</string>
+    <string name="radioInfo_phone_idle">"유휴"</string>
+    <string name="radioInfo_phone_ringing">"벨이 울림"</string>
+    <string name="radioInfo_phone_offhook">"진행 중인 통화"</string>
+    <string name="radioInfo_data_disconnected">"연결끊김"</string>
+    <string name="radioInfo_data_connecting">"연결 중"</string>
+    <string name="radioInfo_data_connected">"연결됨"</string>
+    <string name="radioInfo_data_suspended">"일시정지됨"</string>
+    <string name="radioInfo_unknown">"알 수 없음"</string>
+    <string name="radioInfo_display_packets">"pkts"</string>
+    <string name="radioInfo_display_bytes">"바이트"</string>
+    <string name="radioInfo_display_dbm">"dBm"</string>
+    <string name="radioInfo_display_asu">"asu"</string>
+    <string name="radioInfo_lac">"LAC"</string>
+    <string name="radioInfo_cid">"CID"</string>
+    <string name="sdcard_unmount">"SD 카드 마운트 해제"</string>
+    <!-- no translation found for sdcard_format (362497552060004057) -->
+    <skip />
+    <string name="small_font">"작게"</string>
+    <string name="medium_font">"보통"</string>
+    <string name="large_font">"크게"</string>
+    <string name="font_size_save">"확인"</string>
+    <string name="sdcard_setting">"SD 카드"</string>
+    <string name="battery_info_status_label">"배터리 상태:"</string>
+    <string name="battery_info_scale_label">"배터리 충전 상태:"</string>
+    <string name="battery_info_level_label">"배터리 수준:"</string>
+    <string name="battery_info_health_label">"배터리 상태:"</string>
+    <string name="battery_info_technology_label">"배터리 기술:"</string>
+    <string name="battery_info_voltage_label">"배터리 전압:"</string>
+    <string name="battery_info_voltage_units">"mV"</string>
+    <string name="battery_info_temperature_label">"배터리 온도:"</string>
+    <string name="battery_info_temperature_units">"° C"</string>
+    <string name="battery_info_uptime">"부팅 후 시간:"</string>
+    <string name="battery_info_awake_battery">"배터리 무중단 가동 시간:"</string>
+    <string name="battery_info_awake_plugged">"충전할 때 무중단 가동 시간:"</string>
+    <string name="battery_info_screen_on">"화면 켜짐:"</string>
+    <string name="battery_info_status_unknown">"알 수 없음"</string>
+    <string name="battery_info_status_charging">"충전 중"</string>
+    <string name="battery_info_status_charging_ac">"(AC)"</string>
+    <string name="battery_info_status_charging_usb">"(USB)"</string>
+    <string name="battery_info_status_discharging">"방전 중"</string>
+    <string name="battery_info_status_not_charging">"충전 안 함"</string>
+    <string name="battery_info_status_full">"충전 완료"</string>
+    <string name="battery_info_health_unknown">"알 수 없음"</string>
+    <string name="battery_info_health_good">"좋음"</string>
+    <string name="battery_info_health_overheat">"과열"</string>
+    <string name="battery_info_health_dead">"방전됨"</string>
+    <string name="battery_info_health_over_voltage">"과전압"</string>
+    <string name="battery_info_health_unspecified_failure">"알 수 없는 오류"</string>
+    <string name="bluetooth">"Bluetooth"</string>
+    <string name="bluetooth_visibility">"검색가능"</string>
+    <string name="bluetooth_is_discoverable">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>초 동안 검색가능..."</string>
+    <string name="bluetooth_not_discoverable">"장치를 검색가능하게 설정"</string>
+    <string name="bluetooth_devices">"Bluetooth 장치"</string>
+    <string name="bluetooth_device_name">"장치이름"</string>
+    <string name="bluetooth_name_not_set">"이름을 설정하지 않아 계정 이름 사용"</string>
+    <string name="bluetooth_scan_for_devices">"장치 검색"</string>
+    <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 연결이 끊어집니다."</string>
+    <string name="bluetooth_connected">"연결됨"</string>
+    <string name="bluetooth_disconnected">"연결끊김"</string>
+    <string name="bluetooth_disconnecting">"연결을 끊는 중..."</string>
+    <string name="bluetooth_connecting">"연결 중..."</string>
+    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <skip />
+    <string name="bluetooth_not_connected">"이 장치와 페어링"</string>
+    <string name="bluetooth_pairing">"페어링 중..."</string>
+    <string name="bluetooth_paired">"페어링됨"</string>
+    <string name="bluetooth_device">"핸즈프리/헤드셋"</string>
+    <string name="progress_scanning">"검색 중"</string>
+    <string name="bluetooth_notif_ticker">"Bluetooth 페어링 요청"</string>
+    <string name="bluetooth_notif_title">"페어링 요청"</string>
+    <string name="bluetooth_notif_message">"페어링하려면 선택합니다."</string>
+    <string name="date_and_time">"날짜 및 시간 설정"</string>
+    <string name="date_time_12_hour_sample">"1:00 pm"</string>
+    <string name="date_time_24_hour_sample">"13:00"</string>
+    <string name="choose_timezone">"표준시간대 선택"</string>
+    <string name="display_preview_label">"미리보기:"</string>
+    <string name="display_font_size_label">"글꼴 크기:"</string>
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <string name="intent_sender_sendbroadcast_text">"<xliff:g id="BROADCAST">broadcast</xliff:g> 보내기"</string>
+    <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
+    <string name="intent_sender_startactivity_text">"<xliff:g id="ACTIVITY">activity</xliff:g> 시작"</string>
+    <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
+    <string name="intent_sender_account_label">"계정:"</string>
+    <string name="proxy_clear_text">"지우기"</string>
+    <string name="proxy_port_label">"포트"</string>
+    <string name="proxy_defaultView_text">"기본값 복원"</string>
+    <string name="proxy_action_text">"저장"</string>
+    <string name="proxy_hostname_label">"호스트 이름"</string>
+    <string name="proxy_error">"주의"</string>
+    <string name="proxy_error_dismiss">"확인"</string>
+    <string name="proxy_error_invalid_host">"입력한 호스트 이름이 잘못되었습니다."</string>
+    <string name="proxy_error_empty_port">"포트 필드를 입력해야 합니다."</string>
+    <string name="proxy_error_empty_host_set_port">"호스트 필드가 비어 있는 경우 포트 필드에 입력하면 안 됩니다."</string>
+    <string name="proxy_error_invalid_port">"입력한 포트가 올바르지 않습니다."</string>
+    <string name="radio_info_signal_location_label">"위치:"</string>
+    <string name="radio_info_neighboring_location_label">"인접한 CID:"</string>
+    <string name="radio_info_data_attempts_label">"데이터 시도:"</string>
+    <string name="radio_info_imsi_label">"IMSI:"</string>
+    <string name="radio_info_gprs_service_label">"GPRS 서비스:"</string>
+    <string name="radio_info_roaming_label">"로밍:"</string>
+    <string name="radio_info_imei_label">"IMEI:"</string>
+    <string name="radio_info_call_redirect_label">"통화 경로 재지정:"</string>
+    <string name="radio_info_ppp_resets_label">"부팅 후 PPP 재설정 횟수:"</string>
+    <string name="radio_info_gsm_disconnects_label">"GSM 연결끊기:"</string>
+    <string name="radio_info_current_network_label">"현재 네트워크:"</string>
+    <string name="radio_info_data_successes_label">"데이터 성공:"</string>
+    <string name="radio_info_ppp_received_label">"PPP 받음:"</string>
+    <string name="radio_info_gsm_service_label">"GSM 서비스:"</string>
+    <string name="radio_info_signal_strength_label">"신호 강도:"</string>
+    <string name="radio_info_call_status_label">"통화 상태:"</string>
+    <string name="radio_info_ppp_sent_label">"PPP 보냄:"</string>
+    <string name="radio_info_radio_resets_label">"무선 재설정:"</string>
+    <string name="radio_info_message_waiting_label">"메시지 대기 중:"</string>
+    <string name="radio_info_phone_number_label">"전화번호:"</string>
+    <string name="radio_info_band_mode_label">"무선 주파수 대역 선택"</string>
+    <string name="radio_info_network_type_label">"네트워크 유형:"</string>
+    <string name="radio_info_set_perferred_label">"기본 네트워크 유형 설정:"</string>
+    <string name="radio_info_ping_ipaddr">"IP 주소 Ping:"</string>
+    <string name="radio_info_ping_hostname">"호스트이름(www.google.com) Ping:"</string>
+    <string name="radio_info_http_client_test">"HTTP 클라이언트 테스트:"</string>
+    <string name="radio_info_toggle_ciph_label">"암호화 토글"</string>
+    <string name="ping_test_label">"Ping 테스트 실행"</string>
+    <string name="radio_info_smsc_label">"SMSC:"</string>
+    <string name="radio_info_smsc_update_label">"업데이트"</string>
+    <string name="radio_info_smsc_refresh_label">"새로고침"</string>
+    <!-- no translation found for radio_info_toggle_dns_check_label (8292252930563286858) -->
+    <skip />
+    <string name="band_mode_title">"GSM/UMTS 대역 설정"</string>
+    <string name="band_mode_loading">"대역 목록 로드 중..."</string>
+    <string name="band_mode_set">"설정"</string>
+    <string name="band_mode_failed">"실패"</string>
+    <string name="band_mode_succeeded">"성공"</string>
+    <string name="sdcard_changes_instructions">"변경사항을 적용하려면 USB 케이블을 다시 연결해야 합니다."</string>
+    <string name="sdcard_settings_screen_mass_storage_text">"USB 대용량 저장소 사용"</string>
+    <string name="sdcard_settings_total_bytes_label">"총 바이트 수:"</string>
+    <string name="sdcard_settings_not_present_status">"SD 카드 없음"</string>
+    <string name="sdcard_settings_available_bytes_label">"사용가능한 바이트:"</string>
+    <string name="sdcard_settings_mass_storage_status">"SD 카드를 대용량 저장장치로 사용 중"</string>
+    <string name="sdcard_settings_unmounted_status">"이제 SD 카드를 안전하게 제거할 수 있습니다."</string>
+    <string name="sdcard_settings_bad_removal_status">"SD 카드를 사용하는 중에 분리되었습니다."</string>
+    <string name="sdcard_settings_used_bytes_label">"사용 바이트 수:"</string>
+    <string name="sdcard_settings_scanning_status">"SD 카드에서 미디어 검색 중..."</string>
+    <string name="sdcard_settings_read_only_status">"SD 카드가 읽기전용으로 마운트됨"</string>
+    <string name="next_label">"다음"</string>
+    <string name="language_picker_title">"로케일"</string>
+    <string name="select_your_language">"언어 선택"</string>
+    <string name="activity_picker_label">"활동 선택"</string>
+    <string name="device_info_label">"장치정보"</string>
+    <string name="battery_info_label">"배터리 정보"</string>
+    <!-- no translation found for battery_history_label (8242244969757414501) -->
+    <skip />
+    <string name="display_label">"디스플레이"</string>
+    <string name="phone_info_label">"전화기 정보"</string>
+    <string name="sd_card_settings_label">"SD 카드"</string>
+    <string name="proxy_settings_label">"프록시 설정"</string>
+    <string name="cancel">"취소"</string>
+    <string name="settings_label">"설정"</string>
+    <string name="airplane_mode">"에어플레인 모드"</string>
+    <string name="airplane_mode_summary">"모든 무선 연결 사용 안 함"</string>
+    <string name="airplane_mode_turning_on">"무선 연결을 끊는 중..."</string>
+    <string name="airplane_mode_turning_off">"무선 연결 사용 중..."</string>
+    <string name="radio_controls_title">"무선 제어"</string>
+    <string name="radio_controls_summary">"Wi-Fi, Bluetooth, 에어플레인 모드 및 모바일 네트워크 관리"</string>
+    <string name="date_and_time_settings_title">"날짜 및 시간"</string>
+    <string name="date_and_time_settings_summary">"날짜, 시간, 표준시간대 및 형식 설정"</string>
+    <string name="date_time_auto">"자동"</string>
+    <string name="date_time_auto_summaryOn">"네트워크 제공 값 사용"</string>
+    <string name="date_time_auto_summaryOff">"네트워크 제공 값 사용"</string>
+    <string name="date_time_24hour">"24시간 형식 사용"</string>
+    <string name="date_time_set_time">"시간 설정"</string>
+    <string name="date_time_set_timezone">"표준시간대 선택"</string>
+    <string name="date_time_set_date">"날짜 설정"</string>
+    <string name="date_time_date_format">"날짜형식 선택"</string>
+    <string name="zone_list_menu_sort_alphabetically">"사전순으로 정렬"</string>
+    <string name="zone_list_menu_sort_by_timezone">"시간대별 정렬"</string>
+    <string name="security_settings_title">"보안 및 위치"</string>
+    <string name="security_settings_summary">"내 위치, 화면 잠금해제, SIM 카드 잠금 설정"</string>
+    <string name="security_passwords_title">"비밀번호"</string>
+    <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
+    <string name="bluetooth_quick_toggle_summary">"Bluetooth 켜기"</string>
+    <string name="bluetooth_settings">"Bluetooth 설정"</string>
+    <string name="bluetooth_settings_title">"Bluetooth 설정"</string>
+    <string name="bluetooth_settings_summary">"연결 관리, 장치이름 및 검색가능 여부 설정"</string>
+    <string name="bluetooth_pin_entry">"Bluetooth 페어링 요청"</string>
+    <string name="bluetooth_device_info">"Bluetooth 장치 정보"</string>
+    <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"페어링을 위해 PIN 입력"\n"(0000 또는 1234를 입력하세요.)"</string>
+    <string name="bluetooth_error_title">"주의"</string>
+    <string name="bluetooth_pairing_error_message">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>과(와) 페어링하는 동안 문제가 발생했습니다."</string>
+    <string name="bluetooth_pairing_pin_error_message">"입력한 PIN이 올바르지 않기 때문에 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>과(와) 페어링하는 동안 문제가 발생했습니다."</string>
+    <string name="bluetooth_connecting_error_message">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>에 연결하는 동안 문제가 발생했습니다."</string>
+    <string name="bluetooth_preference_scan_title">"장치 검색"</string>
+    <string name="bluetooth_device_context_connect">"연결"</string>
+    <string name="bluetooth_device_context_disconnect">"연결끊기"</string>
+    <string name="bluetooth_device_context_pair_connect">"페어링 및 연결"</string>
+    <string name="bluetooth_device_context_unpair">"페어링 해제"</string>
+    <string name="bluetooth_device_context_disconnect_unpair">"연결끊기 및 페어링 끊기"</string>
+    <string name="bluetooth_device_context_connect_advanced">"옵션..."</string>
+    <string name="bluetooth_connect_specific_profiles_title">"연결..."</string>
+    <string name="bluetooth_profile_a2dp">"미디어"</string>
+    <string name="bluetooth_profile_headset">"전화"</string>
+    <string name="bluetooth_summary_connected_to_a2dp">"미디어 오디오에 연결됨"</string>
+    <string name="bluetooth_summary_connected_to_headset">"전화기 오디오에 연결됨"</string>
+    <string name="bluetooth_summary_connected_to_a2dp_headset">"전화기 및 미디어 오디오에 연결됨"</string>
+    <string name="bluetooth_device_advanced_title">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 옵션"</string>
+    <string name="bluetooth_device_advanced_online_mode_title">"연결"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary">"Bluetooth 장치에 연결"</string>
+    <string name="bluetooth_device_advanced_profile_header_title">"프로필"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected">"미디어 오디오에 연결됨"</string>
+    <string name="bluetooth_headset_profile_summary_connected">"전화기 오디오에 연결됨"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for">"미디어 오디오에 사용"</string>
+    <string name="bluetooth_headset_profile_summary_use_for">"전화기 오디오에 사용"</string>
+    <string name="wifi">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary">"Wi-Fi 켜기"</string>
+    <string name="wifi_settings">"Wi-Fi 설정"</string>
+    <string name="wifi_settings_category">"Wi-Fi 설정"</string>
+    <string name="wifi_settings_summary">"무선 액세스포인트 설정 및 관리"</string>
+    <string name="forget_network">"저장 안 함"</string>
+    <string name="wifi_status">"상태"</string>
+    <string name="wifi_link_speed">"속도"</string>
+    <string name="wifi_signal_3">"우수"</string>
+    <string name="wifi_signal_2">"좋음"</string>
+    <string name="wifi_signal_1">"양호"</string>
+    <string name="wifi_signal_0">"나쁨"</string>
+    <string name="security">"보안"</string>
+    <string name="wifi_security_open">"개방"</string>
+    <string name="wifi_security_wep">"WEP"</string>
+    <string name="wifi_security_wpa">"WPA"</string>
+    <string name="wifi_security_wpa2">"WPA2"</string>
+    <string name="wifi_security_unknown">"알 수 없음"</string>
+    <string name="wifi_security_verbose_open">"개방형 네트워크"</string>
+    <string name="wifi_security_verbose_wep">"WEP로 보안"</string>
+    <string name="wifi_security_verbose_wpa">"WPA로 보안"</string>
+    <string name="wifi_security_verbose_wpa2">"WPA2로 보안"</string>
+    <string name="ip_address">"IP 주소"</string>
+    <string name="signal">"신호 강도"</string>
+    <string name="wifi_starting">"켜는 중..."</string>
+    <string name="wifi_stopping">"끄는 중..."</string>
+    <string name="wifi_error">"오류"</string>
+    <string name="error_starting">"Wi-Fi를 시작할 수 없음"</string>
+    <string name="error_stopping">"Wi-Fi를 중지할 수 없음"</string>
+    <string name="error_scanning">"네트워크를 검색할 수 없음"</string>
+    <string name="error_connecting">"네트워크에 연결할 수 없음"</string>
+    <string name="error_saving">"네트워크를 저장할 수 없음"</string>
+    <string name="connect">"연결"</string>
+    <string name="connect_to_blank">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에 연결"</string>
+    <string name="please_type_passphrase">"무선 비밀번호"</string>
+    <string name="please_type_hex_key">"WEP 16진수 키(0-9, A-F)"</string>
+    <string name="wifi_show_password">"비밀번호를 표시합니다."</string>
+    <string name="scan_wifi">"검색"</string>
+    <string name="summary_not_in_range">"범위 내에 없음"</string>
+    <string name="summary_remembered">"저장됨"</string>
+    <string name="summary_connection_failed">"연결하지 못했습니다. 다시 시도하세요."</string>
+    <string name="wifi_access_points">"Wi-Fi 네트워크"</string>
+    <string name="wifi_type_ssid">"네트워크 SSID"</string>
+    <string name="wifi_security">"보안"</string>
+    <string name="wifi_save_config">"저장"</string>
+    <string name="wifi_password_unchanged">"(변경 안 함)"</string>
+    <string name="wifi_add_other_network">"Wi-Fi 네트워크 추가"</string>
+    <string name="wifi_notify_open_networks">"네트워크 알림"</string>
+    <string name="wifi_notify_open_networks_summary">"개방형 네트워크를 사용할 수 있을 때 알림"</string>
+    <string name="wifi_password_incorrect_error">"입력한 네트워크 비밀번호가 올바르지 않습니다. 다시 입력하세요."</string>
+    <string name="wifi_generic_connection_error">"네트워크에 연결하는 동안 문제가 발생했습니다. 다시 시도하세요."</string>
+    <string name="wifi_menu_advanced">"고급"</string>
+    <string name="wifi_ip_settings_titlebar">"IP 설정"</string>
+    <string name="wifi_ip_settings_menu_save">"저장"</string>
+    <string name="wifi_ip_settings_menu_cancel">"취소"</string>
+    <string name="wifi_ip_settings_invalid_ip">"올바른 IP 주소를 입력하세요."</string>
+    <string name="wifi_use_static_ip">"고정 IP 사용"</string>
+    <string name="wifi_ip_address">"IP 주소"</string>
+    <string name="wifi_dns1">"DNS 1"</string>
+    <string name="wifi_dns2">"DNS 2"</string>
+    <string name="wifi_gateway">"게이트웨이"</string>
+    <string name="wifi_netmask">"넷마스크"</string>
+    <string name="wifi_context_menu_connect">"네트워크 연결"</string>
+    <string name="wifi_context_menu_forget">"네트워크 저장 안 함"</string>
+    <string name="wifi_context_menu_change_password">"비밀번호 변경"</string>
+    <string name="wifi_advanced_titlebar">"고급"</string>
+    <string name="wifi_setting_num_channels_title">"규정 도메인"</string>
+    <string name="wifi_setting_num_channels_summary">"사용할 채널 수 설정"</string>
+    <string name="wifi_setting_num_channels_error">"규제 도메인을 설정하는 동안 문제가 발생했습니다."</string>
+    <string name="wifi_setting_num_channels_channel_phrase">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g>개 채널"</string>
+    <!-- no translation found for wifi_setting_sleep_policy_title (1367731352485585528) -->
+    <skip />
+    <!-- no translation found for wifi_setting_sleep_policy_summary (7573693311804602041) -->
+    <skip />
+    <!-- no translation found for wifi_setting_sleep_policy_error (5103670439972135148) -->
+    <skip />
+    <string name="wifi_advanced_mac_address_title">"MAC 주소"</string>
+    <string name="fragment_status_scanning">"검색 중..."</string>
+    <string name="fragment_status_connecting">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에 연결 중..."</string>
+    <string name="fragment_status_authenticating">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에서 인증하는 중..."</string>
+    <string name="fragment_status_obtaining_ip">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에서 IP 주소를 가져오는 중..."</string>
+    <string name="fragment_status_connected">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에 연결됨"</string>
+    <string name="fragment_status_disconnecting">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에서 연결을 끊는 중..."</string>
+    <string name="fragment_status_disconnected">"연결끊김"</string>
+    <string name="fragment_status_failed">"실패"</string>
+    <string name="status_scanning">"검색 중..."</string>
+    <string name="status_connecting">"연결 중..."</string>
+    <string name="status_authenticating">"인증하는 중..."</string>
+    <string name="status_obtaining_ip">"주소를 가져오는 중..."</string>
+    <string name="status_connected">"연결됨"</string>
+    <string name="status_disconnecting">"연결을 끊는 중..."</string>
+    <string name="status_disconnected">"연결끊김"</string>
+    <string name="status_failed">"실패"</string>
+    <string name="sound_and_display_settings">"소리 및 디스플레이"</string>
+    <string name="sound_settings">"소리 설정"</string>
+    <string name="sound_and_display_settings_summary">"벨소리, 알림, 화면 밝기 설정"</string>
+    <string name="silent_mode_title">"무음 모드"</string>
+    <string name="silent_mode_summary">"미디어 및 알람 외의 모든 소리가 나지 않습니다."</string>
+    <string name="ringtone_title">"전화 벨소리"</string>
+    <string name="ringtone_summary">"수신전화 기본 벨소리 설정"</string>
+    <string name="ring_volume_title">"벨소리 볼륨"</string>
+    <string name="ring_volume_summary">"수신전화 및 알림에 대한 볼륨 설정"</string>
+    <string name="vibrate_title">"전화올 때 진동"</string>
+    <string name="vibrate_summary">"전화 올 때 진동"</string>
+    <string name="notification_sound_title">"알림 벨소리"</string>
+    <string name="notification_sound_summary">"기본 알림 벨소리 설정"</string>
+    <string name="incoming_call_volume_title">"수신전화 볼륨"</string>
+    <string name="notification_volume_title">"알림 볼륨"</string>
+    <string name="checkbox_notification_same_as_incoming_call">"알림을 위해 수신전화 볼륨 사용"</string>
+    <string name="notification_sound_dialog_title">"알림 벨소리 선택"</string>
+    <string name="media_volume_title">"미디어 볼륨"</string>
+    <string name="media_volume_summary">"음악 및 동영상에 대한 볼륨 설정"</string>
+    <string name="dtmf_tone_enable_title">"터치음 듣기"</string>
+    <string name="dtmf_tone_enable_summary_on">"다이얼패드를 사용할 때 신호음 재생"</string>
+    <string name="dtmf_tone_enable_summary_off">"다이얼패드를 사용할 때 신호음 재생"</string>
+    <string name="sound_effects_enable_title">"선택항목 듣기"</string>
+    <string name="sound_effects_enable_summary_on">"화면 선택 시 소리 재생"</string>
+    <string name="sound_effects_enable_summary_off">"화면 선택 시 소리 재생"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_title (1008791464029179529) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (426729807044947187) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (803791141563778934) -->
+    <skip />
+    <string name="sync_settings">"데이터 동기화"</string>
+    <string name="sync_settings_summary">"동기화할 응용프로그램 선택"</string>
+    <string name="display_settings">"디스플레이 설정"</string>
+    <string name="animations_title">"애니메이션"</string>
+    <string name="animations_summary_on">"창을 열거나 닫을 때 애니메이션 표시"</string>
+    <string name="animations_summary_off">"창을 열거나 닫을 때 애니메이션 표시"</string>
+    <string name="brightness">"밝기"</string>
+    <!-- no translation found for brightness_summary (838917350127550703) -->
+    <skip />
+    <string name="screen_timeout">"화면 시간제한"</string>
+    <!-- no translation found for screen_timeout_summary (2905757633140605334) -->
+    <skip />
+    <string name="sim_lock_settings">"SIM 카드 잠금 설정"</string>
+    <string name="sim_lock_settings_category">"SIM 카드 잠금 설정"</string>
+    <string name="sim_lock_settings_title">"SIM 카드 잠금"</string>
+    <string name="sim_pin_toggle">"SIM 카드 잠금"</string>
+    <string name="sim_lock_on">"전화기를 사용하려면 PIN 필요"</string>
+    <string name="sim_lock_off">"전화기를 사용하려면 PIN 필요"</string>
+    <string name="sim_pin_change">"SIM PIN 변경"</string>
+    <string name="sim_enter_pin">"SIM PIN"</string>
+    <string name="sim_enable_sim_lock">"SIM 카드 잠금"</string>
+    <string name="sim_disable_sim_lock">"SIM 카드 잠금해제"</string>
+    <string name="sim_enter_old">"이전 SIM PIN"</string>
+    <string name="sim_enter_new">"새 SIM PIN"</string>
+    <string name="sim_reenter_new">"새 PIN 다시 입력"</string>
+    <string name="sim_change_pin">"SIM PIN"</string>
+    <string name="sim_bad_pin">"PIN이 잘못되었습니다."</string>
+    <string name="sim_pins_dont_match">"PIN이 일치하지 않습니다."</string>
+    <string name="sim_change_failed">"PIN을 변경할 수 없습니다."\n"PIN이 잘못된 것 같습니다."</string>
+    <string name="sim_change_succeeded">"SIM PIN 변경됨"</string>
+    <string name="sim_lock_failed">"SIM 카드 잠금 상태를 변경할 수 없습니다."\n"PIN이 잘못된 것 같습니다."</string>
+    <string name="sim_enter_ok">"확인"</string>
+    <string name="sim_enter_cancel">"취소"</string>
+    <string name="device_info_settings">"전화기 상태"</string>
+    <string name="system_update_settings_list_item_title">"시스템 업데이트"</string>
+    <string name="system_update_settings_list_item_summary">"시스템 업데이트 확인"</string>
+    <string name="firmware_version">"펌웨어 버전"</string>
+    <string name="model_number">"모델 번호"</string>
+    <string name="baseband_version">"기저대역 버전"</string>
+    <string name="kernel_version">"커널 버전"</string>
+    <string name="build_number">"빌드 번호"</string>
+    <string name="device_info_not_available">"표시할 수 없음"</string>
+    <string name="device_status_activity_title">"상태"</string>
+    <string name="device_status">"상태"</string>
+    <string name="device_status_summary">"IMEI, 전화번호, 신호 등"</string>
+    <string name="storage_settings_title">"SD 카드 및 전화기 저장공간"</string>
+    <string name="storage_settings_summary">"SD 카드 마운트 해제, 사용가능한 저장공간 보기"</string>
+    <string name="status_number">"전화번호"</string>
+    <!-- no translation found for status_network_type (3279383550222116235) -->
+    <skip />
+    <!-- no translation found for status_data_state (5503181397066522950) -->
+    <skip />
+    <string name="status_service_state">"서비스 상태"</string>
+    <string name="status_signal_strength">"신호 강도"</string>
+    <string name="status_roaming">"로밍"</string>
+    <string name="status_operator">"네트워크"</string>
+    <string name="status_wifi_mac_address">"Wi-Fi MAC 주소"</string>
+    <string name="status_bt_address">"Bluetooth 주소"</string>
+    <string name="status_unavailable">"사용할 수 없음"</string>
+    <!-- no translation found for status_network_traffic_stats (2089739529980224804) -->
+    <skip />
+    <!-- no translation found for status_network_traffic_summary (1456797220417923108) -->
+    <skip />
+    <string name="status_up_time">"가동 시간"</string>
+    <string name="status_awake_time">"무중단 가동 시간"</string>
+    <string name="internal_memory">"전화기 내부 저장공간"</string>
+    <string name="sd_memory">"SD 카드"</string>
+    <string name="memory_available">"사용가능한 저장공간"</string>
+    <string name="memory_size">"총 공간"</string>
+    <!-- no translation found for sd_eject (6915293408836853020) -->
+    <skip />
+    <!-- no translation found for sd_eject_summary (3315557796211542962) -->
+    <skip />
+    <!-- no translation found for sd_format (5448738337382712203) -->
+    <skip />
+    <!-- no translation found for sd_format_summary (6616491027883134004) -->
+    <skip />
+    <string name="sd_unavailable">"사용할 수 없음"</string>
+    <string name="read_only">"(읽기전용)"</string>
+    <string name="battery_status_title">"배터리 상태"</string>
+    <string name="battery_level_title">"배터리 수준"</string>
+    <string name="apn_settings">"APN"</string>
+    <string name="apn_edit">"액세스포인트 편집"</string>
+    <string name="apn_not_set">"&lt;설정 안 함&gt;"</string>
+    <string name="apn_name">"이름"</string>
+    <string name="apn_apn">"APN"</string>
+    <string name="apn_http_proxy">"프록시"</string>
+    <string name="apn_http_port">"포트"</string>
+    <string name="apn_user">"사용자 이름"</string>
+    <string name="apn_password">"비밀번호"</string>
+    <string name="apn_server">"서버"</string>
+    <string name="apn_mmsc">"MMSC"</string>
+    <string name="apn_mms_proxy">"MMS 프록시"</string>
+    <string name="apn_mms_port">"MMS 포트"</string>
+    <string name="apn_mcc">"MCC"</string>
+    <string name="apn_mnc">"MNC"</string>
+    <string name="apn_type">"APN 유형"</string>
+    <string name="menu_delete">"APN 삭제"</string>
+    <string name="menu_new">"새 APN"</string>
+    <string name="menu_save">"저장"</string>
+    <string name="menu_cancel">"삭제"</string>
+    <string name="error_title">"주의"</string>
+    <string name="error_name_empty">"이름 필드는 비워둘 수 없습니다."</string>
+    <string name="error_apn_empty">"APN을 비워둘 수 없습니다."</string>
+    <string name="error_mcc_not3">"MCC 필드는 3자리 숫자여야 합니다."</string>
+    <string name="error_mnc_not23">"MNC 필드는 2~3자리 숫자여야 합니다."</string>
+    <string name="master_clear_title">"공장 기본값 데이터 재설정"</string>
+    <string name="master_clear_summary">"전화기의 모든 데이터 지우기"</string>
+    <string name="master_clear_desc">"이 작업을 수행하면 전화기의 모든 데이터 및 다운로드한 응용프로그램이 지워지고 출고시 초기 상태로 재설정됩니다"</string>
+    <string name="master_clear_button_text">"전화기 재설정"</string>
+    <string name="master_clear_final_desc">"모든 데이터 및 응용프로그램을 지우고 전화기를 재설정하시겠습니까? 수행한 후에는 작업을 취소할 수 없습니다."</string>
+    <string name="master_clear_final_button_text">"모두 지우기"</string>
+    <string name="master_clear_gesture_prompt">"잠금해제 패턴 그리기"</string>
+    <string name="master_clear_gesture_explanation">"전화기 재설정을 확인하려면 잠금해제 패턴을 그려야 합니다."</string>
+    <string name="master_clear_failed">"시스템 지우기 서비스를 사용할 수 없어 재설정을 수행하지 못했습니다."</string>
+    <!-- no translation found for media_format_title (4671276096695789895) -->
+    <skip />
+    <!-- no translation found for media_format_summary (3805714639375830120) -->
+    <skip />
+    <!-- no translation found for media_format_desc (1142563222357820834) -->
+    <skip />
+    <!-- no translation found for media_format_button_text (370856400090190151) -->
+    <skip />
+    <!-- no translation found for media_format_final_desc (1776666694910717198) -->
+    <skip />
+    <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_prompt (3109349468816856670) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_explanation (4239529439389660159) -->
+    <skip />
+    <string name="call_settings_title">"통화 설정"</string>
+    <string name="call_settings_summary">"음성메일, 착신전환, 통화중 대기, 발신자 번호 설정"</string>
+    <string name="network_settings_title">"모바일 네트워크"</string>
+    <string name="network_settings_summary">"로밍, 네트워크, APN에 대한 옵션 설정"</string>
+    <string name="location_title">"내 위치 소스"</string>
+    <string name="location_network_based">"무선 네트워크 사용"</string>
+    <string name="location_networks_disabled">"무선 네트워크를 사용하는 응용프로그램(예: 지도)에서 위치 보기"</string>
+    <string name="location_neighborhood_level">"Wi-Fi 및/또는 모바일 네트워크에서 측정된 위치"</string>
+    <string name="location_gps">"GPS 위성 사용"</string>
+    <string name="location_street_level">"도로 수준으로 정확하게 탐색(배터리를 절약하려면 선택 취소)"</string>
+    <string name="location_gps_disabled">"도로 수준으로 탐색(항공사진이 더해져 배터리 추가로 필요)"</string>
+    <string name="about_settings">"전화기 정보"</string>
+    <string name="about_settings_summary">"법률 정보, 전화기 상태, 소프트웨어 버전 보기"</string>
+    <string name="legal_information">"법률정보"</string>
+    <string name="contributors_title">"조력자"</string>
+    <string name="copyright_title">"저작권"</string>
+    <string name="license_title">"라이센스"</string>
+    <string name="terms_title">"약관"</string>
+    <string name="settings_license_activity_title">"오픈소스 라이센스"</string>
+    <string name="settings_license_activity_unavailable">"라이센스를 로드하는 동안 문제가 발생했습니다."</string>
+    <string name="settings_license_activity_loading">"로드 중..."</string>
+    <string name="lock_settings_title">"화면 잠금해제 패턴"</string>
+    <string name="lockpattern_change_lock_pattern_label">"잠금해제 패턴 변경"</string>
+    <string name="lockpattern_need_to_unlock">"저장된 패턴 확인"</string>
+    <string name="lockpattern_need_to_unlock_wrong">"죄송합니다. 다시 시도하세요."</string>
+    <string name="lockpattern_recording_intro_header">"잠금해제 패턴 그리기"</string>
+    <string name="lockpattern_recording_intro_footer">"도움말을 보려면 메뉴를 누르세요."</string>
+    <string name="lockpattern_recording_inprogress">"완료되면 손가락을 뗍니다."</string>
+    <string name="lockpattern_recording_incorrect_too_short">"<xliff:g id="NUMBER">%d</xliff:g>개 이상의 점을 연결합니다. 다시 시도하세요."</string>
+    <string name="lockpattern_pattern_entered_header">"패턴이 기록되었습니다."</string>
+    <string name="lockpattern_need_to_confirm">"확인을 위해 패턴 다시 그리기:"</string>
+    <string name="lockpattern_pattern_confirmed_header">"새 잠금해제 패턴:"</string>
+    <string name="lockpattern_confirm_button_text">"확인"</string>
+    <string name="lockpattern_restart_button_text">"다시 그리기"</string>
+    <string name="lockpattern_retry_button_text">"다시 시도"</string>
+    <string name="lockpattern_continue_button_text">"계속"</string>
+    <string name="lockpattern_settings_title">"잠금해제 패턴"</string>
+    <string name="lockpattern_settings_enable_title">"패턴 필요"</string>
+    <string name="lockpattern_settings_enable_summary">"화면 잠금을 해제하려면 패턴을 그려야 함"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title">"패턴 표시"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title">"촉각 피드백 사용"</string>
+    <string name="lockpattern_settings_choose_lock_pattern">"잠금해제 패턴 설정"</string>
+    <string name="lockpattern_settings_change_lock_pattern">"잠금해제 패턴 변경"</string>
+    <string name="lockpattern_settings_help_how_to_record">"잠금해제 패턴을 그리는 방법"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_header">"잘못된 시도 횟수가 너무 많습니다."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_footer">"<xliff:g id="NUMBER">%d</xliff:g>초 후에 다시 시도하세요."</string>
+    <string name="skip_button_label">"취소"</string>
+    <string name="next_button_label">"다음"</string>
+    <string name="lock_title">"전화기 보안 설정"</string>
+    <string name="lock_intro_message"><font size="17">"개인 화면 잠금해제 패턴을 만들어 전화기 무단 사용을 방지합니다. "\n<font height="17">\n</font><b>"1"</b>"  다음 화면에서 패턴을 예를 들어 그리는 동안 지켜봅니다. "\n<font height="17">\n</font><b>"2"</b>"  준비가 되면 사용자만의 개인 잠금해제 패턴을 그립니다. 여러 개의 패턴을 시험해 볼 수 있지만 4개 이상의 점을 연결해야 합니다. "\n<font height="17">\n</font><b>"3"</b>"  패턴을 다시 그려 확인합니다. "\n<font height="17">\n</font><b>"패턴 그리기를 시작하려면 \'다음\'을 선택하세요"</b>". "\n<font height="3">\n</font>"전화기 보호 화면을 설정하지 않으려면 \'취소\'를 선택하세요."</font></string>
+    <string name="lock_example_title">"패턴 예"</string>
+    <string name="lock_example_message">"4개 이상의 점을 연결합니다."\n\n"고유한 패턴을 그릴 준비가 되면 \'다음\'을 선택합니다."</string>
+    <string name="manageapplications_settings_title">"응용프로그램 관리"</string>
+    <!-- no translation found for manageapplications_settings_summary (6097117021500651232) -->
+    <skip />
+    <string name="applications_settings">"응용프로그램"</string>
+    <string name="applications_settings_summary">"응용프로그램 관리, 빠른실행 바로가기 설정"</string>
+    <string name="applications_settings_header">"응용프로그램 설정"</string>
+    <string name="install_applications">"알 수 없는 소스"</string>
+    <string name="install_unknown_applications">"시판되지 않은 응용프로그램 설치 허용"</string>
+    <string name="install_all_warning">"전화기 및 개인 정보는 출처를 알 수 없는 응용프로그램의 공격에 더욱 취약합니다. 사용자는 이러한 응용프로그램을 사용하여 발생할 수 있는 전화기 손상이나 데이터 손실에 대해 사용자가 단독으로 책임이 있음을 동의합니다."</string>
+    <string name="application_info_label">"응용프로그램 정보"</string>
+    <string name="storage_label">"저장공간"</string>
+    <string name="auto_launch_label">"기본적으로 시작"</string>
+    <string name="permissions_label">"권한"</string>
+    <string name="cache_header_label">"캐시"</string>
+    <string name="clear_cache_btn_text">"캐시 지우기"</string>
+    <string name="cache_size_label">"캐시"</string>
+    <!-- no translation found for controls_label (7611113077086853799) -->
+    <skip />
+    <!-- no translation found for force_stop (7435006169872876756) -->
+    <skip />
+    <string name="total_size_label">"총 용량"</string>
+    <string name="application_size_label">"응용프로그램"</string>
+    <string name="data_size_label">"데이터"</string>
+    <string name="uninstall_text">"제거"</string>
+    <string name="clear_user_data_text">"데이터 지우기"</string>
+    <string name="auto_launch_enable_text">"이 응용프로그램을 해당 작업에 대한 기본 프로그램으로 실행하도록 선택했습니다."</string>
+    <string name="auto_launch_disable_text">"기본값이 설정되지 않았습니다."</string>
+    <string name="clear_activities">"기본 작업 지우기"</string>
+    <string name="unknown">"알 수 없음"</string>
+    <string name="sort_order_alpha">"정렬"</string>
+    <string name="sort_order_size">"크기별 정렬"</string>
+    <string name="manage_space_text">"공간 관리"</string>
+    <!-- no translation found for filter (2018011724373033887) -->
+    <skip />
+    <!-- no translation found for filter_dlg_title (6507663329723966854) -->
+    <skip />
+    <string name="filter_apps_all">"모두"</string>
+    <string name="filter_apps_third_party">"제3자"</string>
+    <string name="filter_apps_running">"실행 중인 패키지"</string>
+    <string name="loading">"로드 중..."</string>
+    <string name="recompute_size">"크기 다시 계산 중..."</string>
+    <string name="clear_data_dlg_title">"삭제"</string>
+    <string name="clear_data_dlg_text">"응용프로그램에 저장한 모든 정보가 영구적으로 삭제됩니다."</string>
+    <string name="dlg_ok">"확인"</string>
+    <string name="dlg_cancel">"취소"</string>
+    <string name="app_not_found_dlg_title">"응용프로그램 없음"</string>
+    <string name="app_not_found_dlg_text">"설치된 응용프로그램 목록에서 응용프로그램을 찾을 수 없습니다."</string>
+    <string name="clear_data_failed">"응용프로그램 데이터를 지울 수 없습니다."</string>
+    <string name="security_settings_desc">"이 응용프로그램은 전화기의 다음 항목에 액세스할 수 있습니다."</string>
+    <!-- no translation found for computing_size (1599186977475211186) -->
+    <skip />
+    <string name="invalid_size_value">"패키지 크기를 계산할 수 없습니다."</string>
+    <string name="empty_list_msg">"타사 응용프로그램이 설치되어 있지 않습니다."</string>
+    <string name="language_settings">"로케일 및 텍스트"</string>
+    <string name="language_settings_summary">"로케일(언어 및 지역), 텍스트 입력 및 자동 수정 옵션 설정"</string>
+    <string name="language_category">"로케일 설정"</string>
+    <string name="text_category">"텍스트 설정"</string>
+    <string name="phone_language">"로케일 선택"</string>
+    <!-- no translation found for phone_language_summary (1809580675831352352) -->
+    <skip />
+    <string name="auto_replace">"자동 바꾸기"</string>
+    <string name="auto_replace_summary">"오타 교정"</string>
+    <string name="auto_caps">"자동 대문자 입력"</string>
+    <string name="auto_caps_summary">"문장의 첫 글자를 대문자로"</string>
+    <string name="auto_punctuate">"자동 구두점 입력"</string>
+    <!-- no translation found for hardkeyboard_category (5957168411305769899) -->
+    <skip />
+    <string name="auto_punctuate_summary">"스페이스바를 두 번 눌러 \'.\' 삽입"</string>
+    <string name="show_password">"비밀번호 표시"</string>
+    <string name="show_password_summary">"입력 시 비밀번호 표시"</string>
+    <!-- no translation found for user_dict_settings_titlebar (765659257455000490) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_title (8357027437499042191) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_summary (2460427065601355471) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_menu_title (4056762757149923551) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_dialog_title (4702613990174126482) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_context_menu_edit_title (2210564879320004837) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_context_menu_delete_title (9140703913776549054) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_empty_text (6209268025109242806) -->
+    <skip />
+    <string name="testing">"테스트 중"</string>
+    <string name="testing_phone_info">"전화기 정보"</string>
+    <string name="testing_battery_info">"배터리 정보"</string>
+    <!-- no translation found for testing_battery_history (3043329445810695647) -->
+    <skip />
+    <string name="quick_launch_title">"빠른실행"</string>
+    <string name="quick_launch_summary">"응용프로그램을 실행하는 바로가기키 설정"</string>
+    <string name="quick_launch_assign_application">"응용프로그램 할당"</string>
+    <string name="quick_launch_no_shortcut">"바로가기 없음"</string>
+    <string name="quick_launch_shortcut">"검색 + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
+    <string name="quick_launch_clear_dialog_title">"지우기"</string>
+    <string name="quick_launch_clear_dialog_message">"<xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> 바로가기(<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>)가 지워집니다."</string>
+    <string name="quick_launch_clear_ok_button">"확인"</string>
+    <string name="quick_launch_clear_cancel_button">"취소"</string>
+    <string name="quick_launch_display_mode_applications">"응용프로그램"</string>
+    <string name="quick_launch_display_mode_shortcuts">"바로가기"</string>
+    <string name="input_methods_settings_title">"텍스트 입력"</string>
+    <string name="input_methods_settings_summary">"텍스트 입력 옵션 관리"</string>
+    <!-- no translation found for input_methods_settings_label_format (4882768027634191074) -->
+    <skip />
+    <string name="development_settings_title">"개발"</string>
+    <string name="development_settings_summary">"응용프로그램 개발 옵션 설정"</string>
+    <string name="enable_adb">"USB 디버깅"</string>
+    <string name="enable_adb_summary">"USB가 연결된 경우 디버그 모드"</string>
+    <string name="keep_screen_on">"켜진 상태로 유지"</string>
+    <string name="keep_screen_on_summary">"충전하는 동안 화면이 꺼지지 않음"</string>
+    <string name="allow_mock_location">"모의 위치 허용"</string>
+    <string name="allow_mock_location_summary">"모의 위치 허용"</string>
+    <!-- no translation found for battery_history_known_apps (6907374478255786240) -->
+    <skip />
+    <!-- no translation found for gadget_picker_title (4335873961457985189) -->
+    <skip />
+    <!-- no translation found for battery_history_details_for (5189636461798594740) -->
+    <skip />
+    <!-- no translation found for battery_history_uid (1016606150528436298) -->
+    <skip />
+    <!-- no translation found for battery_history_network_usage (8010852371665217020) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_received (980307569180518302) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_sent (2501748768602119159) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_total (4444807574361642753) -->
+    <skip />
+    <!-- no translation found for battery_history_cpu_usage (2597353713014790877) -->
+    <skip />
+    <!-- no translation found for battery_history_user_time (6227507614894791359) -->
+    <skip />
+    <!-- no translation found for battery_history_system_time (2015862072724507547) -->
+    <skip />
+    <!-- no translation found for battery_history_total_time (3618703970098556104) -->
+    <skip />
+    <!-- no translation found for battery_history_starts (9137453931978571696) -->
+    <skip />
+    <!-- no translation found for battery_history_days (6387593985264923377) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (2593055276272350197) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (5608990219891318138) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (7397664460929461350) -->
+    <skip />
+    <!-- no translation found for battery_history_packages_sharing_this_uid (4101596071379250050) -->
+    <skip />
+    <!-- no translation found for battery_history_no_data (1177238743237067617) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor (2333488996028993982) -->
+    <skip />
+    <!-- no translation found for battery_history_used_by_packages (3000711380023436470) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage (3593133338613209024) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage_multi (4536084375991014508) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on (1377240025275657277) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_battery (536058210445081888) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_plugged (5019127390021871260) -->
+    <skip />
+    <!-- no translation found for usage_stats_label (5890846333487083609) -->
+    <skip />
+    <!-- no translation found for testing_usage_stats (7823048598893937339) -->
+    <skip />
+    <!-- no translation found for display_order_text (8592776965827565271) -->
+    <skip />
+    <!-- no translation found for app_name_label (2000949925256858308) -->
+    <skip />
+    <!-- no translation found for launch_count_label (4019444833263957024) -->
+    <skip />
+    <!-- no translation found for usage_time_label (295954901452833058) -->
+    <skip />
+</resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
new file mode 100644
index 0000000..112b38b
--- /dev/null
+++ b/res/values-nb/arrays.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="timezone_filters">
+    <item>"Amerika"</item>
+    <item>"Europa"</item>
+    <item>"Afrika"</item>
+    <item>"Asia"</item>
+    <item>"Australia"</item>
+    <item>"Stillehavet"</item>
+    <item>"Alle"</item>
+  </string-array>
+  <string-array name="screen_timeout_entries">
+    <item>"15 sekunder"</item>
+    <item>"30 sekunder"</item>
+    <item>"1 minutt"</item>
+    <item>"2 minutter"</item>
+    <item>"10 minutter"</item>
+    <item>"Aldri slå av"</item>
+  </string-array>
+  <string-array name="wifi_security_entries">
+    <item>"Automatisk"</item>
+    <item>"Ingen"</item>
+    <item>"WEP"</item>
+    <item>"WPA personlig"</item>
+    <item>"WPA2 personlig"</item>
+  </string-array>
+  <string-array name="wifi_security_without_auto_entries">
+    <item>"Ingen"</item>
+    <item>"WEP"</item>
+    <item>"WPA personlig"</item>
+    <item>"WPA2 personlig"</item>
+  </string-array>
+  <string-array name="wifi_wep_type">
+    <item>"Automatisk"</item>
+    <item>"WEP ASCII"</item>
+    <item>"WEP heksadesimal"</item>
+  </string-array>
+    <!-- no translation found for wifi_sleep_policy_entries:0 (3804733751095821976) -->
+    <!-- no translation found for wifi_sleep_policy_entries:1 (1549288661423279207) -->
+    <!-- no translation found for wifi_sleep_policy_entries:2 (1986753720941888596) -->
+    <!-- no translation found for battery_history_type_spinner:0 (2372160040893842611) -->
+    <!-- no translation found for battery_history_type_spinner:1 (7042951832385599110) -->
+    <!-- no translation found for battery_history_type_spinner:2 (7643330117743172161) -->
+    <!-- no translation found for battery_history_type_spinner:3 (7984071435080498080) -->
+    <!-- no translation found for battery_history_which_spinner:0 (8777827398176661463) -->
+    <!-- no translation found for battery_history_which_spinner:1 (2351620008414691945) -->
+    <!-- no translation found for battery_history_which_spinner:2 (1233325583071371898) -->
+    <!-- no translation found for battery_history_which_spinner:3 (524850874274605031) -->
+    <!-- no translation found for usage_stats_display_order_types:0 (9077371706468756228) -->
+    <!-- no translation found for usage_stats_display_order_types:1 (1908750532762193304) -->
+    <!-- no translation found for usage_stats_display_order_types:2 (1213951670006606353) -->
+</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
new file mode 100644
index 0000000..bd6881f
--- /dev/null
+++ b/res/values-nb/strings.xml
@@ -0,0 +1,731 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="device_info_default">"Ukjent"</string>
+    <string name="turn_on_radio">"Turn on radio"</string>
+    <string name="turn_off_radio">"Turn off radio"</string>
+    <string name="turn_on_qxdm">"Enable QXDM SD log"</string>
+    <string name="turn_off_qxdm">"Disable QXDM SD log"</string>
+    <string name="radioInfo_menu_viewADN">"View SIM address book"</string>
+    <string name="radioInfo_menu_viewFDN">"View Fixed Dialing Numbers"</string>
+    <string name="radioInfo_menu_viewSDN">"View Service Dialing Numbers"</string>
+    <string name="radioInfo_menu_getPDP">"Get PDP list"</string>
+    <string name="radioInfo_menu_enableData">"Enable data connection"</string>
+    <string name="radioInfo_menu_disableData">"Disable data connection"</string>
+    <string name="radioInfo_menu_enableDataOnBoot">"Enable data on boot"</string>
+    <string name="radioInfo_menu_disableDataOnBoot">"Disable data on boot"</string>
+    <string name="radioInfo_service_in">"In service"</string>
+    <string name="radioInfo_service_out">"Out of service"</string>
+    <string name="radioInfo_service_emergency">"Emergency calls only"</string>
+    <string name="radioInfo_service_off">"Radio off"</string>
+    <string name="radioInfo_roaming_in">"Roaming"</string>
+    <string name="radioInfo_roaming_not">"Not roaming"</string>
+    <string name="radioInfo_phone_idle">"Idle"</string>
+    <string name="radioInfo_phone_ringing">"Ringing"</string>
+    <string name="radioInfo_phone_offhook">"Call in progress"</string>
+    <string name="radioInfo_data_disconnected">"Disconnected"</string>
+    <string name="radioInfo_data_connecting">"Connecting"</string>
+    <string name="radioInfo_data_connected">"Connected"</string>
+    <string name="radioInfo_data_suspended">"Suspended"</string>
+    <string name="radioInfo_unknown">"unknown"</string>
+    <string name="radioInfo_display_packets">"pkts"</string>
+    <string name="radioInfo_display_bytes">"bytes"</string>
+    <string name="radioInfo_display_dbm">"dBm"</string>
+    <string name="radioInfo_display_asu">"asu"</string>
+    <string name="radioInfo_lac">"LAC"</string>
+    <string name="radioInfo_cid">"CID"</string>
+    <string name="sdcard_unmount">"Unmount SD card"</string>
+    <!-- no translation found for sdcard_format (362497552060004057) -->
+    <skip />
+    <string name="small_font">"Liten"</string>
+    <string name="medium_font">"Middels"</string>
+    <string name="large_font">"Stor"</string>
+    <string name="font_size_save">"OK"</string>
+    <string name="sdcard_setting">"Minnekort"</string>
+    <string name="battery_info_status_label">"Battery status:"</string>
+    <string name="battery_info_scale_label">"Battery scale:"</string>
+    <string name="battery_info_level_label">"Battery level:"</string>
+    <string name="battery_info_health_label">"Battery health:"</string>
+    <string name="battery_info_technology_label">"Battery technology:"</string>
+    <string name="battery_info_voltage_label">"Battery voltage:"</string>
+    <string name="battery_info_voltage_units">"mV"</string>
+    <string name="battery_info_temperature_label">"Battery temperature:"</string>
+    <string name="battery_info_temperature_units">"° C"</string>
+    <string name="battery_info_uptime">"Time since boot:"</string>
+    <string name="battery_info_awake_battery">"Awake time on battery:"</string>
+    <string name="battery_info_awake_plugged">"Awake time when charging:"</string>
+    <string name="battery_info_screen_on">"Screen ON time:"</string>
+    <string name="battery_info_status_unknown">"Unknown"</string>
+    <string name="battery_info_status_charging">"Charging"</string>
+    <string name="battery_info_status_charging_ac">"(AC)"</string>
+    <string name="battery_info_status_charging_usb">"(USB)"</string>
+    <string name="battery_info_status_discharging">"Discharging"</string>
+    <string name="battery_info_status_not_charging">"Not charging"</string>
+    <string name="battery_info_status_full">"Full"</string>
+    <string name="battery_info_health_unknown">"Unknown"</string>
+    <string name="battery_info_health_good">"Good"</string>
+    <string name="battery_info_health_overheat">"Overheat"</string>
+    <string name="battery_info_health_dead">"Dead"</string>
+    <string name="battery_info_health_over_voltage">"Over voltage"</string>
+    <string name="battery_info_health_unspecified_failure">"Unknown error"</string>
+    <string name="bluetooth">"Bluetooth"</string>
+    <string name="bluetooth_visibility">"Synlig"</string>
+    <string name="bluetooth_is_discoverable">"Synlig i <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekunder…"</string>
+    <string name="bluetooth_not_discoverable">"Gjør enheten synlig"</string>
+    <string name="bluetooth_devices">"Bluetooth-enheter"</string>
+    <string name="bluetooth_device_name">"Enhetsnavn"</string>
+    <string name="bluetooth_name_not_set">"Ikke noe navn er valgt, bruker kontonavn"</string>
+    <string name="bluetooth_scan_for_devices">"Søk etter enheter"</string>
+    <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> vil bli koblet fra."</string>
+    <string name="bluetooth_connected">"Tilkoblet"</string>
+    <string name="bluetooth_disconnected">"Frakoblet"</string>
+    <string name="bluetooth_disconnecting">"Kobler fra…"</string>
+    <string name="bluetooth_connecting">"Kobler til…"</string>
+    <!-- no translation found for bluetooth_unknown (644716244548801421) -->
+    <skip />
+    <string name="bluetooth_not_connected">"Par med denne enheten"</string>
+    <string name="bluetooth_pairing">"Parer…"</string>
+    <string name="bluetooth_paired">"Paret"</string>
+    <string name="bluetooth_device">"handsfree/håndsett"</string>
+    <string name="progress_scanning">"Søker"</string>
+    <string name="bluetooth_notif_ticker">"Paringsforespørsel for Bluetooth"</string>
+    <string name="bluetooth_notif_title">"Paringsforespørsel"</string>
+    <string name="bluetooth_notif_message">"Velg å pare med"</string>
+    <string name="date_and_time">"Innstillinger for dato og tid"</string>
+    <string name="date_time_12_hour_sample">"1:00 pm"</string>
+    <string name="date_time_24_hour_sample">"13:00"</string>
+    <string name="choose_timezone">"Velg tidssone"</string>
+    <string name="display_preview_label">"Forhåndsvisning:"</string>
+    <string name="display_font_size_label">"Skriftstørrelse:"</string>
+    <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
+    <skip />
+    <string name="intent_sender_sendbroadcast_text">"Send <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
+    <string name="intent_sender_action_label">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
+    <string name="intent_sender_startactivity_text">"Start <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
+    <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
+    <string name="intent_sender_account_label">"Account:"</string>
+    <string name="proxy_clear_text">"Tøm"</string>
+    <string name="proxy_port_label">"Port"</string>
+    <string name="proxy_defaultView_text">"Gjenopprett standardinnstillinger"</string>
+    <string name="proxy_action_text">"Lagre"</string>
+    <string name="proxy_hostname_label">"Vertsnavn"</string>
+    <string name="proxy_error">"NB"</string>
+    <string name="proxy_error_dismiss">"OK"</string>
+    <string name="proxy_error_invalid_host">"Vertsnavnet er ikke gyldig."</string>
+    <string name="proxy_error_empty_port">"Du må skrive inn et portnummer."</string>
+    <string name="proxy_error_empty_host_set_port">"Feltet for portnummer må være tomt om feltet for vertsnavn er tomt."</string>
+    <string name="proxy_error_invalid_port">"Portnummeret er ikke gyldig."</string>
+    <string name="radio_info_signal_location_label">"Location:"</string>
+    <string name="radio_info_neighboring_location_label">"Neighboring CID:"</string>
+    <string name="radio_info_data_attempts_label">"Data attempts:"</string>
+    <string name="radio_info_imsi_label">"IMSI:"</string>
+    <string name="radio_info_gprs_service_label">"GPRS service:"</string>
+    <string name="radio_info_roaming_label">"Roaming:"</string>
+    <string name="radio_info_imei_label">"IMEI:"</string>
+    <string name="radio_info_call_redirect_label">"Call redirect:"</string>
+    <string name="radio_info_ppp_resets_label">"Number of PPP reset since boot:"</string>
+    <string name="radio_info_gsm_disconnects_label">"GSM disconnects:"</string>
+    <string name="radio_info_current_network_label">"Current network:"</string>
+    <string name="radio_info_data_successes_label">"Data successes:"</string>
+    <string name="radio_info_ppp_received_label">"PPP received:"</string>
+    <string name="radio_info_gsm_service_label">"GSM service:"</string>
+    <string name="radio_info_signal_strength_label">"Signal strength:"</string>
+    <string name="radio_info_call_status_label">"Call status:"</string>
+    <string name="radio_info_ppp_sent_label">"PPP sent:"</string>
+    <string name="radio_info_radio_resets_label">"Radio resets:"</string>
+    <string name="radio_info_message_waiting_label">"Message waiting:"</string>
+    <string name="radio_info_phone_number_label">"Phone number:"</string>
+    <string name="radio_info_band_mode_label">"Select radio band"</string>
+    <string name="radio_info_network_type_label">"Network type:"</string>
+    <string name="radio_info_set_perferred_label">"Set preferred network type:"</string>
+    <string name="radio_info_ping_ipaddr">"Ping IpAddr:"</string>
+    <string name="radio_info_ping_hostname">"Ping Hostname(www.google.com):"</string>
+    <string name="radio_info_http_client_test">"HTTP Client test:"</string>
+    <string name="radio_info_toggle_ciph_label">"Toggle ciphering"</string>
+    <string name="ping_test_label">"Run ping test"</string>
+    <string name="radio_info_smsc_label">"SMSC:"</string>
+    <string name="radio_info_smsc_update_label">"Update"</string>
+    <string name="radio_info_smsc_refresh_label">"Refresh"</string>
+    <!-- no translation found for radio_info_toggle_dns_check_label (8292252930563286858) -->
+    <skip />
+    <string name="band_mode_title">"Velg GSM/UMTS-bånd"</string>
+    <string name="band_mode_loading">"Henter båndliste…"</string>
+    <string name="band_mode_set">"Velg"</string>
+    <string name="band_mode_failed">"Mislykket"</string>
+    <string name="band_mode_succeeded">"Vellykket"</string>
+    <string name="sdcard_changes_instructions">"Endringene vil tre i kraft når USB-kabelen kobles til på nytt"</string>
+    <string name="sdcard_settings_screen_mass_storage_text">"Skru på USB-masselagring"</string>
+    <string name="sdcard_settings_total_bytes_label">"Totalt antall byte:"</string>
+    <string name="sdcard_settings_not_present_status">"Minnekort mangler"</string>
+    <string name="sdcard_settings_available_bytes_label">"Tilgjengelig antall byte:"</string>
+    <string name="sdcard_settings_mass_storage_status">"Minnekortet blir brukt som en masselagringsenhet"</string>
+    <string name="sdcard_settings_unmounted_status">"Det er trygt å fjerne minnekortet"</string>
+    <string name="sdcard_settings_bad_removal_status">"Minnekortet ble fjernet mens det fortsatt var i bruk!"</string>
+    <string name="sdcard_settings_used_bytes_label">"Brukt antall byte:"</string>
+    <string name="sdcard_settings_scanning_status">"Leter etter media på minnekortet…"</string>
+    <string name="sdcard_settings_read_only_status">"Minnekortet ble montert skrivebeskyttet"</string>
+    <string name="next_label">"Neste"</string>
+    <string name="language_picker_title">"Regionsinnstillinger"</string>
+    <string name="select_your_language">"Språk"</string>
+    <string name="activity_picker_label">"Velg aktivitet"</string>
+    <string name="device_info_label">"Enhetsinformasjon"</string>
+    <string name="battery_info_label">"Batteriinformasjon"</string>
+    <!-- no translation found for battery_history_label (8242244969757414501) -->
+    <skip />
+    <string name="display_label">"Skjerm"</string>
+    <string name="phone_info_label">"Telefoninformasjon"</string>
+    <string name="sd_card_settings_label">"Minnekort"</string>
+    <string name="proxy_settings_label">"Mellomtjener-innstillinger"</string>
+    <string name="cancel">"Avbryt"</string>
+    <string name="settings_label">"Innstillinger"</string>
+    <string name="airplane_mode">"Flymodus"</string>
+    <string name="airplane_mode_summary">"Slå av alle trådløse tilkoblinger"</string>
+    <string name="airplane_mode_turning_on">"Slår av trådløse tilkoblinger…"</string>
+    <string name="airplane_mode_turning_off">"Slår på trådløse tilkoblinger…"</string>
+    <string name="radio_controls_title">"Trådløse nett"</string>
+    <string name="radio_controls_summary">"Trådløse nett, Bluetooth, flymodus mobile nettverk"</string>
+    <string name="date_and_time_settings_title">"Dato og tid"</string>
+    <string name="date_and_time_settings_summary">"Sett dato, tid, tidssone og formater"</string>
+    <string name="date_time_auto">"Automatisk"</string>
+    <string name="date_time_auto_summaryOn">"Bruk verdier fra nettverket"</string>
+    <string name="date_time_auto_summaryOff">"Bruk verdier fra nettverket"</string>
+    <string name="date_time_24hour">"Bruk 24-timers format"</string>
+    <string name="date_time_set_time">"Still klokken"</string>
+    <string name="date_time_set_timezone">"Tidssone"</string>
+    <string name="date_time_set_date">"Sett dato"</string>
+    <string name="date_time_date_format">"Datoformat"</string>
+    <string name="zone_list_menu_sort_alphabetically">"Sorter alfabetisk"</string>
+    <string name="zone_list_menu_sort_by_timezone">"Sorter etter tidssone"</string>
+    <string name="security_settings_title">"Sikkerhet og plassering"</string>
+    <string name="security_settings_summary">"Plassering, skjermlås, SIM-kort-lås"</string>
+    <string name="security_passwords_title">"Passord"</string>
+    <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
+    <string name="bluetooth_quick_toggle_summary">"Slå på Bluetooth"</string>
+    <string name="bluetooth_settings">"Bluetooth-innstillinger"</string>
+    <string name="bluetooth_settings_title">"Bluetooth-innstillinger"</string>
+    <string name="bluetooth_settings_summary">"Tilkoblinger, enhetsnavn og synlighet"</string>
+    <string name="bluetooth_pin_entry">"Forespørsel om Bluetooth-paring"</string>
+    <string name="bluetooth_device_info">"Bluetooth-enhetsinformasjon"</string>
+    <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Skriv inn PIN-kode for å pare."\n"(Prøv 0000 eller 1234.)"</string>
+    <string name="bluetooth_error_title">"NB"</string>
+    <string name="bluetooth_pairing_error_message">"Det oppsto et problem under paring med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message">"Det oppsto et problem under paring med <xliff:g id="DEVICE_NAME">%1$s</xliff:g> fordi PIN-koden du oppga var feil."</string>
+    <string name="bluetooth_connecting_error_message">"Kunne ikke koble til <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_preference_scan_title">"Let etter enheter"</string>
+    <string name="bluetooth_device_context_connect">"Koble til"</string>
+    <string name="bluetooth_device_context_disconnect">"Koble fra"</string>
+    <string name="bluetooth_device_context_pair_connect">"Par med og koble til"</string>
+    <string name="bluetooth_device_context_unpair">"Fjern paring"</string>
+    <string name="bluetooth_device_context_disconnect_unpair">"Koble fra og fjern paring"</string>
+    <string name="bluetooth_device_context_connect_advanced">"Innstillinger…"</string>
+    <string name="bluetooth_connect_specific_profiles_title">"Koble til…"</string>
+    <string name="bluetooth_profile_a2dp">"Media"</string>
+    <string name="bluetooth_profile_headset">"Telefon"</string>
+    <string name="bluetooth_summary_connected_to_a2dp">"Koblet til medielyd"</string>
+    <string name="bluetooth_summary_connected_to_headset">"Koblet til telefonlyd"</string>
+    <string name="bluetooth_summary_connected_to_a2dp_headset">"Koblet til medie- og telefonlyd"</string>
+    <string name="bluetooth_device_advanced_title">"Innstillinger for <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_device_advanced_online_mode_title">"Koble til"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary">"Koble til Bluetooth-enhet"</string>
+    <string name="bluetooth_device_advanced_profile_header_title">"Profiler"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected">"Koblet til medielyd"</string>
+    <string name="bluetooth_headset_profile_summary_connected">"Koblet til telefonlyd"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for">"Bruk for medielyd"</string>
+    <string name="bluetooth_headset_profile_summary_use_for">"Bruk for telefonlyd"</string>
+    <string name="wifi">"Trådløst nett"</string>
+    <string name="wifi_quick_toggle_title">"Trådløst nett"</string>
+    <string name="wifi_quick_toggle_summary">"Slå på trådløst nett"</string>
+    <string name="wifi_settings">"Trådløsinnstillinger"</string>
+    <string name="wifi_settings_category">"Innstillinger for trådløst nett"</string>
+    <string name="wifi_settings_summary">"Sett opp og styr trådløse aksesspunkt"</string>
+    <string name="forget_network">"Glem"</string>
+    <string name="wifi_status">"Status"</string>
+    <string name="wifi_link_speed">"Hastighet"</string>
+    <string name="wifi_signal_3">"Utmerket"</string>
+    <string name="wifi_signal_2">"God"</string>
+    <string name="wifi_signal_1">"OK"</string>
+    <string name="wifi_signal_0">"Dårlig"</string>
+    <string name="security">"Sikkerhet"</string>
+    <string name="wifi_security_open">"Åpen"</string>
+    <string name="wifi_security_wep">"WEP"</string>
+    <string name="wifi_security_wpa">"WPA"</string>
+    <string name="wifi_security_wpa2">"WPA2"</string>
+    <string name="wifi_security_unknown">"Ukjent"</string>
+    <string name="wifi_security_verbose_open">"Åpent nettverk"</string>
+    <string name="wifi_security_verbose_wep">"Sikret med WEP"</string>
+    <string name="wifi_security_verbose_wpa">"Sikret med WPA"</string>
+    <string name="wifi_security_verbose_wpa2">"Sikret med WPA2"</string>
+    <string name="ip_address">"IP-adresse"</string>
+    <string name="signal">"Signalstyrke"</string>
+    <string name="wifi_starting">"Slår på…"</string>
+    <string name="wifi_stopping">"Slår av…"</string>
+    <string name="wifi_error">"Feil"</string>
+    <string name="error_starting">"Kunne ikke starte trådløsnett"</string>
+    <string name="error_stopping">"Kunne ikke slå av trådløsnett"</string>
+    <string name="error_scanning">"Kunne ikke søke etter trådløse nettverk"</string>
+    <string name="error_connecting">"Kunne ikke koble til nettverket"</string>
+    <string name="error_saving">"Kunne ikke lagre nettverket"</string>
+    <string name="connect">"Koble til"</string>
+    <string name="connect_to_blank">"Koble til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="please_type_passphrase">"Passord for trådløst nettverk"</string>
+    <string name="please_type_hex_key">"WEP-nøkkel i hex (0-9, A-F)"</string>
+    <string name="wifi_show_password">"Vis passord."</string>
+    <string name="scan_wifi">"Søk"</string>
+    <string name="summary_not_in_range">"Utenfor rekkevidde"</string>
+    <string name="summary_remembered">"Husket"</string>
+    <string name="summary_connection_failed">"Tilkoblingen mislyktes, velg for å prøve på nytt"</string>
+    <string name="wifi_access_points">"Trådløse nettverk"</string>
+    <string name="wifi_type_ssid">"Nettverks-SSID"</string>
+    <string name="wifi_security">"Sikkerhet"</string>
+    <string name="wifi_save_config">"Lagre"</string>
+    <string name="wifi_password_unchanged">"(uendret)"</string>
+    <string name="wifi_add_other_network">"Legg til trådløst nettverk"</string>
+    <string name="wifi_notify_open_networks">"Varsling om nettverk"</string>
+    <string name="wifi_notify_open_networks_summary">"Varsle når et åpent nettverk er tilgjengelig"</string>
+    <string name="wifi_password_incorrect_error">"Nettverkspassordet er ikke riktig. Prøv igjen."</string>
+    <string name="wifi_generic_connection_error">"Kunne ikke koble til nettverket. Prøv igjen."</string>
+    <string name="wifi_menu_advanced">"Avansert"</string>
+    <string name="wifi_ip_settings_titlebar">"IP-innstillinger"</string>
+    <string name="wifi_ip_settings_menu_save">"Lagre"</string>
+    <string name="wifi_ip_settings_menu_cancel">"Avbryt"</string>
+    <string name="wifi_ip_settings_invalid_ip">"Skriv inn en gyldig IP-adresse."</string>
+    <string name="wifi_use_static_ip">"Bruk statisk IP-adresse"</string>
+    <string name="wifi_ip_address">"IP-adresse"</string>
+    <string name="wifi_dns1">"DNS 1"</string>
+    <string name="wifi_dns2">"DNS 2"</string>
+    <string name="wifi_gateway">"Standardruter"</string>
+    <string name="wifi_netmask">"Nettmaske"</string>
+    <string name="wifi_context_menu_connect">"Koble til nettverk"</string>
+    <string name="wifi_context_menu_forget">"Glem nettverk"</string>
+    <string name="wifi_context_menu_change_password">"Endre passord"</string>
+    <string name="wifi_advanced_titlebar">"Avansert"</string>
+    <string name="wifi_setting_num_channels_title">"Juridisk område"</string>
+    <string name="wifi_setting_num_channels_summary">"Velg antall kanaler som skal brukes"</string>
+    <string name="wifi_setting_num_channels_error">"Kunne ikke velge juridisk område."</string>
+    <string name="wifi_setting_num_channels_channel_phrase">"<xliff:g id="NUM_CHANNELS">%1$d</xliff:g> kanaler"</string>
+    <!-- no translation found for wifi_setting_sleep_policy_title (1367731352485585528) -->
+    <skip />
+    <!-- no translation found for wifi_setting_sleep_policy_summary (7573693311804602041) -->
+    <skip />
+    <!-- no translation found for wifi_setting_sleep_policy_error (5103670439972135148) -->
+    <skip />
+    <string name="wifi_advanced_mac_address_title">"MAC-adresse"</string>
+    <string name="fragment_status_scanning">"Søker…"</string>
+    <string name="fragment_status_connecting">"Kobler til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
+    <string name="fragment_status_authenticating">"Autentiserer mot <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
+    <string name="fragment_status_obtaining_ip">"Henter IP-adresse fra <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
+    <string name="fragment_status_connected">"Koblet til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="fragment_status_disconnecting">"Kobler fra <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
+    <string name="fragment_status_disconnected">"Frakoblet"</string>
+    <string name="fragment_status_failed">"Mislykket"</string>
+    <string name="status_scanning">"Søker…"</string>
+    <string name="status_connecting">"Kobler til…"</string>
+    <string name="status_authenticating">"Autentiserer…"</string>
+    <string name="status_obtaining_ip">"Henter adresse…"</string>
+    <string name="status_connected">"Tilkoblet"</string>
+    <string name="status_disconnecting">"Kobler fra…"</string>
+    <string name="status_disconnected">"Frakoblet"</string>
+    <string name="status_failed">"Mislykket"</string>
+    <string name="sound_and_display_settings">"Lyd og skjerm"</string>
+    <string name="sound_settings">"Lydinnstillinger"</string>
+    <string name="sound_and_display_settings_summary">"Ringetoner, varsling, lysstyrke"</string>
+    <string name="silent_mode_title">"Stillemodus"</string>
+    <string name="silent_mode_summary">"Slå av alle lyder unntatt media og alarmer"</string>
+    <string name="ringtone_title">"Ringetone"</string>
+    <string name="ringtone_summary">"Standard ringetone for innkommende anrop"</string>
+    <string name="ring_volume_title">"Ringevolum"</string>
+    <string name="ring_volume_summary">"Volum for innkommende anrop og varslinger"</string>
+    <string name="vibrate_title">"Vibrering"</string>
+    <string name="vibrate_summary">"Vibrer ved innkommende anrop"</string>
+    <string name="notification_sound_title">"Ringetone for varsling"</string>
+    <string name="notification_sound_summary">"Standard ringetone for varsling"</string>
+    <string name="incoming_call_volume_title">"Volum for innkommende anrop"</string>
+    <string name="notification_volume_title">"Varslingsvolum"</string>
+    <string name="checkbox_notification_same_as_incoming_call">"Bruk volum for innkommende anrop også for varslinger"</string>
+    <string name="notification_sound_dialog_title">"Velg ringetone for varsling"</string>
+    <string name="media_volume_title">"Medievolum"</string>
+    <string name="media_volume_summary">"Volum for musikk og video"</string>
+    <string name="dtmf_tone_enable_title">"Hørbare tastetoner"</string>
+    <string name="dtmf_tone_enable_summary_on">"Spill toner når talltastaturet benyttes"</string>
+    <string name="dtmf_tone_enable_summary_off">"Spill toner når talltastaturet benytes"</string>
+    <string name="sound_effects_enable_title">"Hørbart valg"</string>
+    <string name="sound_effects_enable_summary_on">"Lag lyd under skjermvalg"</string>
+    <string name="sound_effects_enable_summary_off">"Lag lyd under skjermvalg"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_title (1008791464029179529) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (426729807044947187) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (803791141563778934) -->
+    <skip />
+    <string name="sync_settings">"Datasynkronisering"</string>
+    <string name="sync_settings_summary">"Applikasjoner som skal synkroniseres"</string>
+    <string name="display_settings">"Skjerminnstillinger"</string>
+    <string name="animations_title">"Animasjon"</string>
+    <string name="animations_summary_on">"Vis animasjon når vinduer åpnes/lukkes"</string>
+    <string name="animations_summary_off">"Vis animasjon når vinduer åpnes/lukkes"</string>
+    <string name="brightness">"Lysstyrke"</string>
+    <!-- no translation found for brightness_summary (838917350127550703) -->
+    <skip />
+    <string name="screen_timeout">"Skjermsparer"</string>
+    <!-- no translation found for screen_timeout_summary (2905757633140605334) -->
+    <skip />
+    <string name="sim_lock_settings">"Innstillinger for SIM-kort-lås"</string>
+    <string name="sim_lock_settings_category">"Sett opp SIM-kort-lås"</string>
+    <string name="sim_lock_settings_title">"SIM-kort-lås"</string>
+    <string name="sim_pin_toggle">"Lås SIM-kortet"</string>
+    <string name="sim_lock_on">"Krev PIN-kode for å bruke telefonen"</string>
+    <string name="sim_lock_off">"Krev PIN-kode for å bruke telefonen"</string>
+    <string name="sim_pin_change">"Endre SIM-PIN-kode"</string>
+    <string name="sim_enter_pin">"PIN-kode for SIM-kort"</string>
+    <string name="sim_enable_sim_lock">"Lås SIM-kortet"</string>
+    <string name="sim_disable_sim_lock">"Lås opp SIM-kortet"</string>
+    <string name="sim_enter_old">"Gammel PIN-kode for SIM-kort"</string>
+    <string name="sim_enter_new">"Ny PIN-kode for SIM-kort"</string>
+    <string name="sim_reenter_new">"Skriv inn ny PIN-kode en gang til"</string>
+    <string name="sim_change_pin">"SIM-kode for PIN-kort"</string>
+    <string name="sim_bad_pin">"Feil PIN-kode!"</string>
+    <string name="sim_pins_dont_match">"De to PIN-kodene stemmer ikke overens!"</string>
+    <string name="sim_change_failed">"Kunne ikke endre PIN-kode."\n"Det er mulig PIN-koden var gal."</string>
+    <string name="sim_change_succeeded">"PIN-koden for SIM-kortet ble endret."</string>
+    <string name="sim_lock_failed">"Kunne ikke endre låsestatus for SIM-kortet."\n"Det er mulig PIN-koden var gal."</string>
+    <string name="sim_enter_ok">"OK"</string>
+    <string name="sim_enter_cancel">"Avbryt"</string>
+    <string name="device_info_settings">"Telefonstatus"</string>
+    <string name="system_update_settings_list_item_title">"Systemoppdateringer"</string>
+    <string name="system_update_settings_list_item_summary">"Se etter systemoppdateringer"</string>
+    <string name="firmware_version">"Firmware-versjon"</string>
+    <string name="model_number">"Modellnummer"</string>
+    <string name="baseband_version">"Versjon av radioprogramvare"</string>
+    <string name="kernel_version">"Kjerneversjon"</string>
+    <string name="build_number">"Byggenummer"</string>
+    <string name="device_info_not_available">"Ikke tilgjengelig"</string>
+    <string name="device_status_activity_title">"Status"</string>
+    <string name="device_status">"Status"</string>
+    <string name="device_status_summary">"IMEI, telefonnummer, signal, osv."</string>
+    <string name="storage_settings_title">"Minnekort og lagring"</string>
+    <string name="storage_settings_summary">"Avmonter minnekort, vis ledig plass"</string>
+    <string name="status_number">"Telefonnummer"</string>
+    <string name="status_network_type">"Nettverkstype"</string>
+    <string name="status_data_state">"Datatilgang"</string>
+    <string name="status_service_state">"Servicestatus"</string>
+    <string name="status_signal_strength">"Signalstyrke"</string>
+    <string name="status_roaming">"Roaming"</string>
+    <string name="status_operator">"Nettverk"</string>
+    <string name="status_wifi_mac_address">"MAC-adresse for WLAN"</string>
+    <string name="status_bt_address">"Bluetooth-adresse"</string>
+    <string name="status_unavailable">"Ikke tilgjengelig"</string>
+    <!-- no translation found for status_network_traffic_stats (2089739529980224804) -->
+    <skip />
+    <!-- no translation found for status_network_traffic_summary (1456797220417923108) -->
+    <skip />
+    <string name="status_up_time">"Oppetid"</string>
+    <string name="status_awake_time">"Våken tid"</string>
+    <string name="internal_memory">"Intern lagringsplass"</string>
+    <string name="sd_memory">"Minnekort"</string>
+    <string name="memory_available">"Tilgjengelig plass"</string>
+    <string name="memory_size">"Total plass"</string>
+    <string name="sd_eject">"Avmonter/løs ut minnekort"</string>
+    <!-- no translation found for sd_eject_summary (3315557796211542962) -->
+    <skip />
+    <!-- no translation found for sd_format (5448738337382712203) -->
+    <skip />
+    <!-- no translation found for sd_format_summary (6616491027883134004) -->
+    <skip />
+    <string name="sd_unavailable">"Ikke tilgjengelig"</string>
+    <string name="read_only">"(skrivebeskyttet)"</string>
+    <string name="battery_status_title">"Batteristatus"</string>
+    <string name="battery_level_title">"Batterinivå"</string>
+    <string name="apn_settings">"APN"</string>
+    <string name="apn_edit">"Rediger APN"</string>
+    <string name="apn_not_set">"&lt;Ikke satt&gt;"</string>
+    <string name="apn_name">"Navn"</string>
+    <string name="apn_apn">"APN-navn"</string>
+    <string name="apn_http_proxy">"Mellomtjener"</string>
+    <string name="apn_http_port">"Port"</string>
+    <string name="apn_user">"Brukernavn"</string>
+    <string name="apn_password">"Passord"</string>
+    <string name="apn_server">"Tjener"</string>
+    <string name="apn_mmsc">"MMSC"</string>
+    <string name="apn_mms_proxy">"MMS-mellomtjener"</string>
+    <string name="apn_mms_port">"MMS-port"</string>
+    <string name="apn_mcc">"MCC"</string>
+    <string name="apn_mnc">"MNC"</string>
+    <string name="apn_type">"APN-type"</string>
+    <string name="menu_delete">"Slett APN"</string>
+    <string name="menu_new">"Nytt APN"</string>
+    <string name="menu_save">"Lagre"</string>
+    <string name="menu_cancel">"Forkast"</string>
+    <string name="error_title">"NB"</string>
+    <string name="error_name_empty">"Feltet «navn» kan ikke være tomt."</string>
+    <string name="error_apn_empty">"APNet kan ikke være tomt."</string>
+    <string name="error_mcc_not3">"MCC-feltet må være på tre siffer."</string>
+    <string name="error_mnc_not23">"MNC-feltet må være på to eller tre siffer."</string>
+    <string name="master_clear_title">"Fabrikkinnstillinger"</string>
+    <string name="master_clear_summary">"Fjern alle data fra telefonen"</string>
+    <string name="master_clear_desc">"Dette vil nullstille telefonen til fabrikktilstanden, noe som fjerner alle data og nedlastede applikasjoner!"</string>
+    <string name="master_clear_button_text">"Nullstill telefonen"</string>
+    <string name="master_clear_final_desc">"Nullstill telefonen, noe som vil fjerne alle data og applikasjoner? Dette kan ikke gjøres om!"</string>
+    <string name="master_clear_final_button_text">"Fjern alt"</string>
+    <string name="master_clear_gesture_prompt">"Tegn opplåsingsmønsteret"</string>
+    <string name="master_clear_gesture_explanation">"Du må tegne opplåsingsmønsteret for å bekrefte nullstilling av telefonen."</string>
+    <string name="master_clear_failed">"Telefonen ble ikke nullstilt fordi nullstillingstjenesten ikke er tilgjengelig."</string>
+    <!-- no translation found for media_format_title (4671276096695789895) -->
+    <skip />
+    <!-- no translation found for media_format_summary (3805714639375830120) -->
+    <skip />
+    <!-- no translation found for media_format_desc (1142563222357820834) -->
+    <skip />
+    <!-- no translation found for media_format_button_text (370856400090190151) -->
+    <skip />
+    <!-- no translation found for media_format_final_desc (1776666694910717198) -->
+    <skip />
+    <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_prompt (3109349468816856670) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_explanation (4239529439389660159) -->
+    <skip />
+    <string name="call_settings_title">"Samtaleinnstillinger"</string>
+    <string name="call_settings_summary">"Telefonsvarer, viderekobling, samtale venter, nummervisning"</string>
+    <string name="network_settings_title">"Mobile nettverk"</string>
+    <string name="network_settings_summary">"Innstillinger for roaming, nettverk, APN"</string>
+    <string name="location_title">"Kilder for min plassering"</string>
+    <string name="location_network_based">"Bruk trådløse nettverk"</string>
+    <string name="location_networks_disabled">"Se plassering i applikasjoner (som kart) ved hjelp av trådløse nettverk"</string>
+    <string name="location_neighborhood_level">"Plassering bestemmes ved hjelp av trådløse og/eller mobile nettverk"</string>
+    <string name="location_gps">"Bruk GPS-satellitter"</string>
+    <string name="location_street_level">"Nøyaktig til gatenivå (slå av for å spare batteri)"</string>
+    <string name="location_gps_disabled">"Finn plassering på gatenivå (bruker mer batteri, og trenger fri sikt til himmelen)"</string>
+    <string name="about_settings">"Om telefonen"</string>
+    <string name="about_settings_summary">"Vis juridisk informasjon, telefonstatus, programvareversjon"</string>
+    <string name="legal_information">"Juridisk informasjon"</string>
+    <string name="contributors_title">"Medvirkende"</string>
+    <string name="copyright_title">"Opphavsrett"</string>
+    <string name="license_title">"Lisens"</string>
+    <string name="terms_title">"Betingelser"</string>
+    <string name="settings_license_activity_title">"Åpen kildekode-lisenser"</string>
+    <string name="settings_license_activity_unavailable">"Kunne ikke hente lisensene."</string>
+    <string name="settings_license_activity_loading">"henter…"</string>
+    <string name="lock_settings_title">"Opplåsingsmønster for skjerm"</string>
+    <string name="lockpattern_change_lock_pattern_label">"Opplåsingsmønster"</string>
+    <string name="lockpattern_need_to_unlock">"Bekreft lagret mønster"</string>
+    <string name="lockpattern_need_to_unlock_wrong">"Beklager, prøv igjen:"</string>
+    <string name="lockpattern_recording_intro_header">"Tegn et opplåsingsmønster"</string>
+    <string name="lockpattern_recording_intro_footer">"Trykk menyknappen for hjelp."</string>
+    <string name="lockpattern_recording_inprogress">"Slipp fingeren når du er ferdig."</string>
+    <string name="lockpattern_recording_incorrect_too_short">"Tegn et mønster over minst <xliff:g id="NUMBER">%d</xliff:g> prikker. Prøv igjen:"</string>
+    <string name="lockpattern_pattern_entered_header">"Mønster lagret!"</string>
+    <string name="lockpattern_need_to_confirm">"Tegn mønsteret igjen for å bekrefte:"</string>
+    <string name="lockpattern_pattern_confirmed_header">"Ditt nye opplåsingsmønster:"</string>
+    <string name="lockpattern_confirm_button_text">"Bekreft"</string>
+    <string name="lockpattern_restart_button_text">"Tegn på nytt"</string>
+    <string name="lockpattern_retry_button_text">"Prøv igjen"</string>
+    <string name="lockpattern_continue_button_text">"Continue"</string>
+    <string name="lockpattern_settings_title">"Opplåsingsmønster"</string>
+    <string name="lockpattern_settings_enable_title">"Krev mønster"</string>
+    <string name="lockpattern_settings_enable_summary">"Krev mønster for å låse opp skjermen"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title">"Synlig mønster"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title">"Taktil tilbakemelding"</string>
+    <string name="lockpattern_settings_choose_lock_pattern">"Opplåsingsmønster"</string>
+    <string name="lockpattern_settings_change_lock_pattern">"Opplåsingsmønster"</string>
+    <string name="lockpattern_settings_help_how_to_record">"Hvordan tegne et opplåsingsmønster"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_header">"For mange gale forsøk!"</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_footer">"Prøv igjen om <xliff:g id="NUMBER">%d</xliff:g> sekunder."</string>
+    <string name="skip_button_label">"Avbryt"</string>
+    <string name="next_button_label">"Neste"</string>
+    <string name="lock_title">"Sikring av telefonen"</string>
+    <string name="lock_intro_message"><font size="17">"Beskytt telefonen fra uautorisert bruk ved å lage et personlig opplåsingsmønster for skjermen. "\n<font height="17">\n</font><b>"1"</b>"  På den neste skjermen, se på mens et eksempelmønster blir tegnet. "\n<font height="17">\n</font><b>"2"</b>"  Når du er klar, tegn ditt eget personlige opplåsingsmønster. Prøv med forskjellige mønster, men tegn over minst fire prikker. "\n<font height="17">\n</font><b>"3"</b>"  Tegn mønsteret på nytt for å bekrefte. "\n<font height="17">\n</font><b>"Klar? Velg «neste»."</b>" "\n<font height="3">\n</font>"For å la telefonen forbli ubeskyttet, velg «Avbryt»."</font></string>
+    <string name="lock_example_title">"Eksempelmønster"</string>
+    <string name="lock_example_message">"Tegn over minst fire prikker."\n" "\n"Velg «Neste» når du er klar til å tegne ditt eget mønster."</string>
+    <string name="manageapplications_settings_title">"Installerte applikasjoner"</string>
+    <!-- no translation found for manageapplications_settings_summary (6097117021500651232) -->
+    <skip />
+    <string name="applications_settings">"Applikasjoner"</string>
+    <string name="applications_settings_summary">"Installerte applikasjoner, hurtigtaster"</string>
+    <string name="applications_settings_header">"Innstillinger for applikasjoner"</string>
+    <string name="install_applications">"Ukjente kilder"</string>
+    <string name="install_unknown_applications">"Tillat installasjon av applikasjoner som ikke kommer fra markedet"</string>
+    <string name="install_all_warning">"Telefonen og dine personlige data er mer sårbare mot angrep fra applikasjoner som kommer fra ukjente kilder. Du godtar at du selv er ansvarlig for enhver skade på telefonen eller tap av data som måtte oppstå fra bruk av slike applikasjoner."</string>
+    <string name="application_info_label">"Applikasjonsinformasjon"</string>
+    <string name="storage_label">"Lagring"</string>
+    <string name="auto_launch_label">"Start som standard"</string>
+    <string name="permissions_label">"Rettigheter"</string>
+    <string name="cache_header_label">"Hurtiglager"</string>
+    <string name="clear_cache_btn_text">"Fjern hurtiglager"</string>
+    <string name="cache_size_label">"Hurtiglager"</string>
+    <!-- no translation found for controls_label (7611113077086853799) -->
+    <skip />
+    <!-- no translation found for force_stop (7435006169872876756) -->
+    <skip />
+    <string name="total_size_label">"Totalt"</string>
+    <string name="application_size_label">"Applikasjon"</string>
+    <string name="data_size_label">"Data"</string>
+    <string name="uninstall_text">"Avinstaller"</string>
+    <string name="clear_user_data_text">"Fjern data"</string>
+    <string name="auto_launch_enable_text">"Du har valgt å starte denne applikasjonen som standard for noen handlinger."</string>
+    <string name="auto_launch_disable_text">"Ingen standardvalg satt."</string>
+    <string name="clear_activities">"Fjern standardvalg"</string>
+    <string name="unknown">"Ukjent"</string>
+    <string name="sort_order_alpha">"Sorter"</string>
+    <string name="sort_order_size">"Sorter etter størrelse"</string>
+    <string name="manage_space_text">"Styr plass"</string>
+    <!-- no translation found for filter (2018011724373033887) -->
+    <skip />
+    <!-- no translation found for filter_dlg_title (6507663329723966854) -->
+    <skip />
+    <string name="filter_apps_all">"Alle"</string>
+    <string name="filter_apps_third_party">"Tredjeparts"</string>
+    <string name="filter_apps_running">"Kjører"</string>
+    <string name="loading">"Laster…"</string>
+    <string name="recompute_size">"Beregner størrelse på nytt…"</string>
+    <string name="clear_data_dlg_title">"Slett"</string>
+    <string name="clear_data_dlg_text">"All informasjon du har lagret i denne applikasjonen vil bli fjernet permanent."</string>
+    <string name="dlg_ok">"OK"</string>
+    <string name="dlg_cancel">"Avbryt"</string>
+    <string name="app_not_found_dlg_title">"Fant ikke applikasjonen"</string>
+    <string name="app_not_found_dlg_text">"Applikasjonen ble ikke funnet i listen av installerte applikasjoner."</string>
+    <string name="clear_data_failed">"Kunne ikke fjerne applikasjonadata."</string>
+    <string name="security_settings_desc">"Applikasjonen har disse rettighetene på telefonen:"</string>
+    <string name="computing_size">"Beregner fortsatt…"</string>
+    <string name="invalid_size_value">"Kunne ikke beregne pakkestørrelse"</string>
+    <string name="empty_list_msg">"Ingen tredjepartsapplikasjoner er installert."</string>
+    <string name="language_settings">"Språk og tekst"</string>
+    <string name="language_settings_summary">"Innstillinger for språk, region, skriving av tekst og feilretting"</string>
+    <string name="language_category">"Innstillinger for språk"</string>
+    <string name="text_category">"Tekstinnstillinger"</string>
+    <string name="phone_language">"Språk"</string>
+    <!-- no translation found for phone_language_summary (1809580675831352352) -->
+    <skip />
+    <string name="auto_replace">"Automatisk erstatting"</string>
+    <string name="auto_replace_summary">"Rett opp stavefeil"</string>
+    <string name="auto_caps">"Stor forbokstav"</string>
+    <string name="auto_caps_summary">"Start automatisk setninger med stor bokstav"</string>
+    <string name="auto_punctuate">"Autopunktum"</string>
+    <!-- no translation found for hardkeyboard_category (5957168411305769899) -->
+    <skip />
+    <string name="auto_punctuate_summary">"Trykk mellomromstasten to ganger for å skrive punktum"</string>
+    <string name="show_password">"Synlige passord"</string>
+    <string name="show_password_summary">"Vis passord mens de skrives inn"</string>
+    <!-- no translation found for user_dict_settings_titlebar (765659257455000490) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_title (8357027437499042191) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_summary (2460427065601355471) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_menu_title (4056762757149923551) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_dialog_title (4702613990174126482) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_context_menu_edit_title (2210564879320004837) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_context_menu_delete_title (9140703913776549054) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_empty_text (6209268025109242806) -->
+    <skip />
+    <string name="testing">"Testing"</string>
+    <string name="testing_phone_info">"Telefoninformasjon"</string>
+    <string name="testing_battery_info">"Batteriinformasjon"</string>
+    <!-- no translation found for testing_battery_history (3043329445810695647) -->
+    <skip />
+    <string name="quick_launch_title">"Hurtigtaster"</string>
+    <string name="quick_launch_summary">"Tastatursnarveier for å starte applikasjoner"</string>
+    <string name="quick_launch_assign_application">"Tilordne applikasjon"</string>
+    <string name="quick_launch_no_shortcut">"Ingen snarvei"</string>
+    <string name="quick_launch_shortcut">"Søk + <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g>"</string>
+    <string name="quick_launch_clear_dialog_title">"Fjern"</string>
+    <string name="quick_launch_clear_dialog_message">"Snarveien for <xliff:g id="SHORTCUT_LETTER">%1$s</xliff:g> (<xliff:g id="APPLICATION_NAME">%2$s</xliff:g>) will be fjernet."</string>
+    <string name="quick_launch_clear_ok_button">"OK"</string>
+    <string name="quick_launch_clear_cancel_button">"Avbryt"</string>
+    <string name="quick_launch_display_mode_applications">"Applikasjoner"</string>
+    <string name="quick_launch_display_mode_shortcuts">"Snarveier"</string>
+    <string name="input_methods_settings_title">"Skriving av tekst"</string>
+    <string name="input_methods_settings_summary">"Innstillinger for skriving av tekst"</string>
+    <!-- no translation found for input_methods_settings_label_format (4882768027634191074) -->
+    <skip />
+    <string name="development_settings_title">"Utvikling"</string>
+    <string name="development_settings_summary">"Innstillinger for applikasjonsutvikling"</string>
+    <string name="enable_adb">"USB-debugging"</string>
+    <string name="enable_adb_summary">"Debug-modus når USB er koblet til"</string>
+    <string name="keep_screen_on">"Forbli våken"</string>
+    <string name="keep_screen_on_summary">"Skjermen vil aldri blankes under lading"</string>
+    <string name="allow_mock_location">"Tillat manuell plassering"</string>
+    <string name="allow_mock_location_summary">"Tillat manuell plassering"</string>
+    <!-- no translation found for battery_history_known_apps (6907374478255786240) -->
+    <skip />
+    <!-- no translation found for gadget_picker_title (4335873961457985189) -->
+    <skip />
+    <!-- no translation found for battery_history_details_for (5189636461798594740) -->
+    <skip />
+    <!-- no translation found for battery_history_uid (1016606150528436298) -->
+    <skip />
+    <!-- no translation found for battery_history_network_usage (8010852371665217020) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_received (980307569180518302) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_sent (2501748768602119159) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_total (4444807574361642753) -->
+    <skip />
+    <!-- no translation found for battery_history_cpu_usage (2597353713014790877) -->
+    <skip />
+    <!-- no translation found for battery_history_user_time (6227507614894791359) -->
+    <skip />
+    <!-- no translation found for battery_history_system_time (2015862072724507547) -->
+    <skip />
+    <!-- no translation found for battery_history_total_time (3618703970098556104) -->
+    <skip />
+    <!-- no translation found for battery_history_starts (9137453931978571696) -->
+    <skip />
+    <!-- no translation found for battery_history_days (6387593985264923377) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (2593055276272350197) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (5608990219891318138) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (7397664460929461350) -->
+    <skip />
+    <!-- no translation found for battery_history_packages_sharing_this_uid (4101596071379250050) -->
+    <skip />
+    <!-- no translation found for battery_history_no_data (1177238743237067617) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor (2333488996028993982) -->
+    <skip />
+    <!-- no translation found for battery_history_used_by_packages (3000711380023436470) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage (3593133338613209024) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage_multi (4536084375991014508) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on (1377240025275657277) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_battery (536058210445081888) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_plugged (5019127390021871260) -->
+    <skip />
+    <!-- no translation found for usage_stats_label (5890846333487083609) -->
+    <skip />
+    <!-- no translation found for testing_usage_stats (7823048598893937339) -->
+    <skip />
+    <!-- no translation found for display_order_text (8592776965827565271) -->
+    <skip />
+    <!-- no translation found for app_name_label (2000949925256858308) -->
+    <skip />
+    <!-- no translation found for launch_count_label (4019444833263957024) -->
+    <skip />
+    <!-- no translation found for usage_time_label (295954901452833058) -->
+    <skip />
+</resources>
diff --git a/res/values-nl-rNL/strings.xml b/res/values-nl-rNL/strings.xml
deleted file mode 100644
index 36eb251..0000000
--- a/res/values-nl-rNL/strings.xml
+++ /dev/null
@@ -1,883 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="device_info_default">"Onbekend"</string>
-    <string name="device_info_uptime">"Tijd geactiveerd"</string>
-    <string name="device_info_awaketime">"Opwektijd"</string>
-    <string name="device_info_asleeptime">"Slaaptijd"</string>
-    <string name="turn_on_radio">"Radio uitschakelen"</string>
-    <string name="turn_off_radio">"Radio uitschakelen"</string>
-    <string name="turn_on_qxdm">"QXDM sd-log inschakelen"</string>
-    <string name="turn_off_qxdm">"QXDM sd-log uitschakelen"</string>
-    <string name="radioInfo_menu_viewADN">"SIM-adresboek weergeven"</string>
-    <string name="radioInfo_menu_viewFDN">"Vaste nummers weergeven"</string>
-    <string name="radioInfo_menu_viewSDN">"Service kiesnummers weergeven"</string>
-    <string name="radioInfo_menu_getPDP">"PDP-lijst verkrijgen"</string>
-    <string name="radioInfo_menu_enableData">"Gegevensverbinding inschakelen"</string>
-    <string name="radioInfo_menu_disableData">"Gegevensverbinding uitschakelen"</string>
-    <!-- no translation found for radioInfo_menu_enableDataOnBoot (1926825935390738605) -->
-    <skip />
-    <!-- no translation found for radioInfo_menu_disableDataOnBoot (1229911918312837466) -->
-    <skip />
-    <string name="radioInfo_service_in">"Geactiveerd"</string>
-    <string name="radioInfo_service_out">"Buiten dienst"</string>
-    <string name="radioInfo_service_emergency">"Alleen alarmnummers"</string>
-    <string name="radioInfo_service_off">"Radio uit"</string>
-    <string name="radioInfo_roaming_in">"Roaming"</string>
-    <string name="radioInfo_roaming_not">"Geen roaming"</string>
-    <string name="radioInfo_phone_idle">"Niet-actief"</string>
-    <string name="radioInfo_phone_ringing">"Bezig met overgaan"</string>
-    <string name="radioInfo_phone_offhook">"Gesprek bezig"</string>
-    <string name="radioInfo_data_disconnected">"Verbinding verbroken"</string>
-    <string name="radioInfo_data_connecting">"Verbinding"</string>
-    <string name="radioInfo_data_connected">"Verbonden"</string>
-    <!-- no translation found for radioInfo_data_suspended (4953150687356763202) -->
-    <skip />
-    <string name="radioInfo_unknown">"onbekend"</string>
-    <string name="radioInfo_display_packets">"pkts"</string>
-    <string name="radioInfo_display_bytes">"bytes"</string>
-    <string name="radioInfo_display_dbm">"dBm"</string>
-    <string name="radioInfo_display_asu">"asu"</string>
-    <string name="radioInfo_lac">"LAC"</string>
-    <string name="radioInfo_cid">"CID"</string>
-    <string name="sdcard_unmount">"Sd-kaart vrijgeven"</string>
-    <string name="small_font">"Klein"</string>
-    <string name="medium_font">"Normaal"</string>
-    <string name="large_font">"Groot"</string>
-    <string name="font_size_save">"OK"</string>
-    <string name="sdcard_setting">"Sd-kaart"</string>
-    <string name="screen_off_timeout_label">"Scherm uit time-out"</string>
-    <string name="stay_on">"Ingeschakeld laten als aangesloten"</string>
-    <string name="app_launcher_newView_text">"Nieuwe AppLauncher"</string>
-    <string name="battery_info_status_label">"Batterijstatus:"</string>
-    <string name="battery_info_scale_label">"Batterijschaal:"</string>
-    <string name="battery_info_level_label">"Batterijniveau:"</string>
-    <string name="battery_info_health_label">"Batterijstatus:"</string>
-    <string name="battery_info_technology_label">"Batterijtechnologie:"</string>
-    <string name="battery_info_voltage_label">"Batterijvoltage:"</string>
-    <string name="battery_info_voltage_units">"mV"</string>
-    <string name="battery_info_temperature_label">"Batterijtemperatuur:"</string>
-    <string name="battery_info_temperature_units">"° C"</string>
-    <!-- no translation found for battery_info_uptime (1195623257533912354) -->
-    <skip />
-    <!-- no translation found for battery_info_awake_battery (1529944627925423756) -->
-    <skip />
-    <!-- no translation found for battery_info_awake_plugged (7272044960586959459) -->
-    <skip />
-    <!-- no translation found for battery_info_screen_on (832651425042656482) -->
-    <skip />
-    <string name="battery_info_status_unknown">"Onbekend"</string>
-    <string name="battery_info_status_charging">"opladen"</string>
-    <string name="battery_info_status_charging_ac">"(wisselstroom)"</string>
-    <string name="battery_info_status_charging_usb">"(Usb)"</string>
-    <string name="battery_info_status_discharging">"Bezig met ontladen"</string>
-    <string name="battery_info_status_not_charging">"Wordt niet opgeladen"</string>
-    <string name="battery_info_status_full">"Vol"</string>
-    <string name="battery_info_health_unknown">"Onbekend"</string>
-    <string name="battery_info_health_good">"Goed"</string>
-    <string name="battery_info_health_overheat">"Oververhitting"</string>
-    <string name="battery_info_health_dead">"Dood"</string>
-    <string name="battery_info_health_over_voltage">"Spanning te hoog"</string>
-    <string name="battery_info_health_unspecified_failure">"Onbekende fout"</string>
-    <string name="bluetooth">"Bluetooth"</string>
-    <string name="bluetooth_stopping">"Bluetooth wordt gestopt…"</string>
-    <string name="bluetooth_disabled">"Bluetooth is uitgeschakeld"</string>
-    <string name="bluetooth_enabled">"Bluetooth is nu ingeschakeld"</string>
-    <string name="bluetooth_enabling">"Bluetooth wordt ingeschakeld…"</string>
-    <string name="bluetooth_visibility">"Zichtbaarheid"</string>
-    <string name="bluetooth_is_discoverable">"Toestel is zichtbaar"</string>
-    <string name="bluetooth_not_discoverable">"Toestel is niet zichtbaar"</string>
-    <string name="bluetooth_devices">"Bluetooth-apparaten"</string>
-    <string name="bluetooth_device_name">"Apparaatnaam"</string>
-    <string name="bluetooth_name_not_set">"Geen naam ingesteld, accountnaam wordt gebruikt"</string>
-    <string name="bluetooth_scan_for_devices">"Zoeken naar Bluetooth-apparaten"</string>
-    <string name="bluetooth_clear_list">"Apparaatlijst wissen"</string>
-    <string name="bluetooth_disconnect_blank">"Verbinding met %1$s verbreken?"</string>
-    <string name="bluetooth_connected">"Verbonden"</string>
-    <!-- no translation found for bluetooth_disconnected (779512372559332317) -->
-    <skip />
-    <!-- no translation found for bluetooth_disconnecting (613305857810977890) -->
-    <skip />
-    <string name="bluetooth_connecting">"Verbinden…"</string>
-    <string name="bluetooth_unknown">"Onbekend"</string>
-    <string name="bluetooth_not_connected">"Niet verbonden"</string>
-    <!-- no translation found for bluetooth_failed_to_enable (10261849074413402) -->
-    <skip />
-    <!-- no translation found for bluetooth_pairing (8284273555047880444) -->
-    <skip />
-    <!-- no translation found for failed_to_pair (5265027255173301781) -->
-    <skip />
-    <string name="failed_to_connect">"Geen verbinding gemaakt met "</string>
-    <string name="bluetooth_paired">"Gekoppeld"</string>
-    <!-- no translation found for bluetooth_paired_not_nearby (2890021978719716438) -->
-    <skip />
-    <string name="bluetooth_device">"handsfree / headset"</string>
-    <!-- no translation found for bluetooth_disconnect (4070053533691322466) -->
-    <skip />
-    <!-- no translation found for bluetooth_connect (6123567524009555372) -->
-    <skip />
-    <!-- no translation found for bluetooth_unpair (6786377316984999718) -->
-    <skip />
-    <!-- no translation found for bluetooth_pair (6433088623778842494) -->
-    <skip />
-    <string name="progress_scanning">"Scannen"</string>
-    <!-- no translation found for bluetooth_notif_ticker (6269529534945974964) -->
-    <skip />
-    <!-- no translation found for bluetooth_notif_title (3790273649365187417) -->
-    <skip />
-    <!-- no translation found for bluetooth_notif_message (3713615470961259613) -->
-    <skip />
-    <string name="date_and_time">"Datum &amp; Tijd"</string>
-    <!-- no translation found for date_time_12_hour_sample (3346099183513673921) -->
-    <skip />
-    <!-- no translation found for date_time_24_hour_sample (2930431568836213699) -->
-    <skip />
-    <string name="choose_timezone">"Tijdzone selecteren"</string>
-    <string name="display_preview_label">"Voorbld:"</string>
-    <string name="display_font_size_label">"Lettergrootte:"</string>
-    <string name="intent_sender_data_label">"Gegevens:"</string>
-    <string name="intent_sender_sendbroadcast_text">"Uitzending versturen"</string>
-    <string name="intent_sender_action_label">"Actie:"</string>
-    <string name="intent_sender_startactivity_text">"Activiteit starten"</string>
-    <string name="intent_sender_resource_label">"Netwerkbron:"</string>
-    <string name="intent_sender_account_label">"Account:"</string>
-    <string name="keyguard_pw_mod_text">"Blokkeringspatroon selecteren"</string>
-    <string name="keyguard_pin_mod_text">"Pincode wijzigen"</string>
-    <string name="keyguard_label">"Toetsbescherming"</string>
-    <string name="keyguard_sim_pin_label">"SIM-pincode"</string>
-    <string name="keyguard_password_old_password_error_text">"Het oude wachtwoord is onjuist! Probeer het opnieuw"</string>
-    <string name="keyguard_password_button_text">"OK"</string>
-    <string name="keyguard_password_confirm_new_label">"Bevestig nieuw wachtwoord:"</string>
-    <string name="keyguard_password_new_label">"Nieuw wachtwoord:"</string>
-    <string name="keyguard_password_old_label">"Oud wachtwoord:"</string>
-    <string name="keyguard_password_mismatch_error_text">"De twee wachtwoorden verschillen! Voer ze nogmaals in"</string>
-    <string name="proxy_clear_text">"Wissen"</string>
-    <string name="proxy_port_label">"Poort"</string>
-    <string name="proxy_defaultView_text">"Beginwaarden"</string>
-    <string name="proxy_action_text">"Opslaan"</string>
-    <string name="proxy_hostname_label">"Hostnaam"</string>
-    <string name="proxy_error">"Let op!"</string>
-    <string name="proxy_error_dismiss">"OK"</string>
-    <string name="proxy_error_invalid_host">"De opgegeven hostnaam is ongeldig"</string>
-    <string name="proxy_error_empty_port">"U moet het poortveld voltooien"</string>
-    <string name="proxy_error_empty_host_set_port">"Het poortveld moet blanco zijn als het hostveld blanco is"</string>
-    <string name="proxy_error_invalid_port">"De opgegeven poort is ongeldig"</string>
-    <string name="radio_info_signal_location_label">"Locatie:"</string>
-    <string name="radio_info_neighboring_location_label">"Omgevings-CID:"</string>
-    <string name="radio_info_data_attempts_label">"Gegevenspogingen:"</string>
-    <string name="radio_info_imsi_label">"IMSI:"</string>
-    <string name="radio_info_gprs_service_label">"Gprs-dienst:"</string>
-    <string name="radio_info_roaming_label">"Roaming:"</string>
-    <string name="radio_info_imei_label">"IMEI:"</string>
-    <string name="radio_info_call_redirect_label">"Gesprek doorsturen:"</string>
-    <string name="radio_info_ppp_resets_label">"Aantal PPP-resets sinds opstarten:"</string>
-    <string name="radio_info_gsm_disconnects_label">"Gsm-verbinding verbreken:"</string>
-    <string name="radio_info_current_network_label">"Huidig netwerk:"</string>
-    <string name="radio_info_data_successes_label">"Gegevenssuccessen:"</string>
-    <string name="radio_info_ppp_received_label">"PPP ontvangen:"</string>
-    <string name="radio_info_gsm_service_label">"Gsm-dienst:"</string>
-    <string name="radio_info_signal_strength_label">"Signaalsterkte:"</string>
-    <string name="radio_info_call_status_label">"Oproepstatus:"</string>
-    <string name="radio_info_ppp_sent_label">"PPP verzonden:"</string>
-    <string name="radio_info_radio_resets_label">"Radio resets:"</string>
-    <string name="radio_info_message_waiting_label">"Bericht wachtend op behandeling:"</string>
-    <string name="radio_info_phone_number_label">"Telefoonnummer:"</string>
-    <string name="radio_info_band_mode_label">"Radioband selecteren"</string>
-    <string name="radio_info_network_type_label">"Netwerktype:"</string>
-    <string name="radio_info_set_perferred_label">"Voorkeursnetwerktype instellen:"</string>
-    <!-- no translation found for radio_info_ping_ipaddr (7229811664688502621) -->
-    <skip />
-    <!-- no translation found for radio_info_ping_hostname (7817617877155199848) -->
-    <skip />
-    <!-- no translation found for radio_info_http_client_test (5100483824350561339) -->
-    <skip />
-    <!-- no translation found for radio_info_toggle_ciph_label (2705975697585878388) -->
-    <skip />
-    <!-- no translation found for ping_test_label (99396772665008247) -->
-    <skip />
-    <!-- no translation found for radio_info_smsc_label (6577522217730406517) -->
-    <skip />
-    <!-- no translation found for radio_info_smsc_update_label (6471155265532972448) -->
-    <skip />
-    <!-- no translation found for radio_info_smsc_refresh_label (4334057389927982364) -->
-    <skip />
-    <string name="band_mode_title">"Gsm/umts-band instellen"</string>
-    <string name="band_mode_loading">"Bandlijst wordt geladen…"</string>
-    <string name="band_mode_set">"Instellen"</string>
-    <string name="band_mode_failed">"Mislukt"</string>
-    <string name="band_mode_succeeded">"Geslaagd"</string>
-    <string name="ringer_volume_ringer_mode_label">"Beltoonmodus"</string>
-    <string name="ringer_volume_screen_increasing_text">"Belvolume verhogen"</string>
-    <string name="ringer_volume_ringtone_label">"Beltoon"</string>
-    <string name="ringer_volume_instructions">"Gebruik volumetoetsen om het belvolume aan te passen"</string>
-    <string name="sdcard_changes_instructions">"Veranderingen worden toegepast zodra de usb-kabel opnieuw wordt aangesloten"</string>
-    <string name="sdcard_settings_screen_mass_storage_text">"Usb-massaopslag inschakelen"</string>
-    <string name="sdcard_settings_total_bytes_label">"Totaal aantal bytes:"</string>
-    <string name="sdcard_settings_not_present_status">"Geen sd-kaart"</string>
-    <string name="sdcard_settings_available_bytes_label">"Beschikbare bytes:"</string>
-    <string name="sdcard_settings_mass_storage_status">"Sd-kaart wordt gebruikt als apparaat voor massaopslag"</string>
-    <string name="sdcard_settings_unmounted_status">"Nu kunt u de sd-kaart veilig verwijderen"</string>
-    <string name="sdcard_settings_bad_removal_status">"Sd-kaart is verwijderd terwijl deze nog in gebruik was!"</string>
-    <string name="sdcard_settings_used_bytes_label">"Gebruikt aantal bytes:"</string>
-    <string name="sdcard_settings_scanning_status">"Sd-kaart wordt gescand op media…"</string>
-    <string name="sdcard_settings_read_only_status">"Sd-kaart is alleen-lezen"</string>
-    <string name="sdcard_removal_alert_title">"Onveilige verwijdering van sd-kaart"</string>
-    <string name="sdcard_unmountable_alert_title">"Sd-kaart onleesbaar"</string>
-    <string name="telephony_user_label">"Gebruiker:"</string>
-    <string name="telephony_server_label">"Server:"</string>
-    <string name="telephony_name_label">"Naam:"</string>
-    <string name="telephony_mmsc_label">"MMSC:"</string>
-    <string name="telephony_apn_label">"APN:"</string>
-    <string name="telephony_mcc_label">"MCC:"</string>
-    <string name="telephony_port_label">"Poort:"</string>
-    <string name="telephony_password_label">"Wachtwoord :"</string>
-    <string name="telephony_proxy_label">"Proxy:"</string>
-    <string name="telephony_mnc_label">"MNC:"</string>
-    <string name="telephony_mmsproxy_label">"MMS-proxy:"</string>
-    <string name="telephony_mmsport_label">"MMS-poort:"</string>
-    <string name="next_label">"Volgende"</string>
-    <string name="language_picker_title">"Taal"</string>
-    <!-- no translation found for select_your_language (9081963472187973531) -->
-    <skip />
-    <string name="activity_picker_label">"Activiteit selecteren"</string>
-    <string name="device_info_label">"Toestelinfo"</string>
-    <string name="battery_info_label">"Batterij-info"</string>
-    <string name="display_label">"Scherm"</string>
-    <string name="phone_info_label">"Telefooninfo"</string>
-    <string name="sd_card_settings_label">"Sd-kaart"</string>
-    <string name="proxy_settings_label">"Proxyinstellingen"</string>
-    <string name="cancel">"Annuleren"</string>
-    <string name="settings_label">"Instellingen"</string>
-    <string name="airplane_mode">"Vliegtuigmodus"</string>
-    <!-- no translation found for airplane_mode_summary (3500557633417506553) -->
-    <skip />
-    <!-- no translation found for airplane_mode_turning_on (1243134862683209663) -->
-    <skip />
-    <!-- no translation found for airplane_mode_turning_off (2291183932542256190) -->
-    <skip />
-    <!-- no translation found for radio_controls_title (4981652151494753702) -->
-    <skip />
-    <!-- no translation found for radio_controls_summary (9105526969569292926) -->
-    <skip />
-    <string name="date_and_time_settings_title">"Datum &amp; Tijd"</string>
-    <!-- no translation found for date_and_time_settings_summary (3489093199543794055) -->
-    <skip />
-    <string name="date_time_auto">"Auto"</string>
-    <string name="date_time_auto_summaryOn">"Gebruik door netwerk geleverde waardes"</string>
-    <string name="date_time_auto_summaryOff">"Gebruik door gebruikers gekozen waardes"</string>
-    <string name="date_time_24hour">"24-uurs indeling"</string>
-    <string name="date_time_set_time">"Tijd instellen"</string>
-    <string name="date_time_set_timezone">"Tijdzone selecteren"</string>
-    <string name="date_time_set_date">"Datum instellen"</string>
-    <string name="date_time_date_format">"Datumindeling instellen"</string>
-    <!-- no translation found for zone_list_menu_sort_alphabetically (8983103881342552870) -->
-    <skip />
-    <!-- no translation found for zone_list_menu_sort_by_timezone (7025442915093990469) -->
-    <skip />
-    <!-- no translation found for security_settings_title (969550777120624897) -->
-    <skip />
-    <!-- no translation found for security_settings_summary (3202445632951595923) -->
-    <skip />
-    <!-- no translation found for security_passwords_title (4466520735598079063) -->
-    <skip />
-    <string name="bluetooth_quick_toggle_title">"Bluetooth"</string>
-    <!-- no translation found for bluetooth_quick_toggle_summary (2292894901949724405) -->
-    <skip />
-    <!-- no translation found for bluetooth_settings (1545097653816106117) -->
-    <skip />
-    <string name="bluetooth_settings_title">"Bluetooth-instellingen"</string>
-    <!-- no translation found for bluetooth_settings_summary (1419697742707330821) -->
-    <skip />
-    <string name="bluetooth_pin_entry">"Bluetooth-pincode invoeren"</string>
-    <string name="bluetooth_device_info">"Bluetooth-toestelinfo"</string>
-    <string name="bluetooth_pairing_msg">"Koppelen…"</string>
-    <string name="bluetooth_enter_pin_msg">"Voer pincode in voor "</string>
-    <string name="bluetooth_new_data">"Voer nieuwe gegevens in"</string>
-    <string name="bluetooth_new_data_confirm">"OK"</string>
-    <string name="bluetooth_new_data_cancel">"Annuleren"</string>
-    <string name="bluetooth_scan_for_new_devices">"Bezig met scannen naar nieuwe toestellen…"</string>
-    <string name="bluetooth_discoverability_panel_title">"Maak me…"</string>
-    <string name="bluetooth_discoverable">"Zichtbaar &amp; met verbinding"</string>
-    <string name="bluetooth_connectable">"Alleen waarmee verbinding mogelijk is"</string>
-    <string name="bluetooth_neither">"Zichtbaar noch met verbinding"</string>
-    <!-- no translation found for bluetooth_preference_scan_title (5457824526570506576) -->
-    <skip />
-    <!-- no translation found for bluetooth_preference_scan_summary (4169248439102381141) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_context_connect (1360133741981139570) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_context_disconnect (3848550418295778426) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_context_pair_connect (3526057462723016574) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_context_unpair (1842004154350000288) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_context_disconnect_unpair (302606151874724466) -->
-    <skip />
-    <!-- no translation found for bluetooth_device_context_connect_advanced (5004355397163127842) -->
-    <skip />
-    <!-- no translation found for bluetooth_connect_specific_profiles_title (8557599374974072579) -->
-    <skip />
-    <!-- no translation found for bluetooth_profile_a2dp (6848174297822591204) -->
-    <skip />
-    <!-- no translation found for bluetooth_profile_headset (8660680578951214915) -->
-    <skip />
-    <string name="wifi">"Wi-Fi"</string>
-    <!-- no translation found for wifi_quick_toggle_title (4404851801229148146) -->
-    <skip />
-    <!-- no translation found for wifi_quick_toggle_summary (5254705029759236850) -->
-    <skip />
-    <string name="wifi_settings">"Wifi-instellingen"</string>
-    <!-- no translation found for wifi_settings_category (610287013958209636) -->
-    <skip />
-    <!-- no translation found for wifi_settings_summary (8789964612748859011) -->
-    <skip />
-    <string name="forget_network">"Vergeten"</string>
-    <!-- no translation found for wifi_status (4374358089273446404) -->
-    <skip />
-    <!-- no translation found for wifi_link_speed (8766462457818203791) -->
-    <skip />
-    <!-- no translation found for wifi_signal_3 (1264702582845283580) -->
-    <skip />
-    <!-- no translation found for wifi_signal_2 (3765197678751351272) -->
-    <skip />
-    <!-- no translation found for wifi_signal_1 (3469786868912545422) -->
-    <skip />
-    <!-- no translation found for wifi_signal_0 (7285670709111185231) -->
-    <skip />
-    <string name="security">"Beveiliging"</string>
-    <!-- no translation found for wifi_security_open (6529463996240023139) -->
-    <skip />
-    <!-- no translation found for wifi_security_wep (8543279149057388909) -->
-    <skip />
-    <!-- no translation found for wifi_security_wpa (7229647924366572707) -->
-    <skip />
-    <!-- no translation found for wifi_security_wpa2 (641020427516679969) -->
-    <skip />
-    <!-- no translation found for wifi_security_unknown (7700764937580224930) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_open (7105261201983314526) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wep (2018232984976185738) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa (7240649761750328761) -->
-    <skip />
-    <!-- no translation found for wifi_security_verbose_wpa2 (5470387821577814216) -->
-    <skip />
-    <string name="ip_address">"Ip-adres"</string>
-    <string name="signal">"Signaalsterkte"</string>
-    <!-- no translation found for wifi_starting (380585178092358776) -->
-    <skip />
-    <!-- no translation found for wifi_stopping (1130828572786743854) -->
-    <skip />
-    <!-- no translation found for wifi_error (7223451684597210919) -->
-    <skip />
-    <string name="error_starting">"Fout bij starten van wifi"</string>
-    <string name="error_stopping">"Fout bij stoppen van wifi"</string>
-    <string name="error_scanning">"Fout bij scannen naar netwerken"</string>
-    <string name="error_connecting">"Fout bij maken van netwerkverbinding"</string>
-    <string name="error_saving">"Fout bij opslaan netwerk"</string>
-    <string name="connect">"Verbinden"</string>
-    <string name="connect_to_blank">"Verbinding maken met %1$s"</string>
-    <string name="please_type_passphrase">"Voer de draadloze wachtwoordcode in"</string>
-    <!-- no translation found for please_type_hex_key (3792966437690051423) -->
-    <skip />
-    <!-- no translation found for wifi_show_password (2142204324333077532) -->
-    <skip />
-    <string name="scan_wifi">"Scannen"</string>
-    <string name="summary_not_in_range">"Niet in bereik"</string>
-    <string name="summary_remembered">"Onthouden"</string>
-    <!-- no translation found for summary_connection_failed (5466501123715222542) -->
-    <skip />
-    <string name="wifi_access_points">"Netwerken"</string>
-    <!-- no translation found for wifi_type_ssid (4389276980911820577) -->
-    <skip />
-    <!-- no translation found for wifi_security (8115513846744543151) -->
-    <skip />
-    <!-- no translation found for wifi_save_config (1041957548332322297) -->
-    <skip />
-    <!-- no translation found for wifi_password_unchanged (5583782979192657008) -->
-    <skip />
-    <!-- no translation found for wifi_add_other_network (914072465709281633) -->
-    <skip />
-    <!-- no translation found for wifi_notify_open_networks (3091942233631075516) -->
-    <skip />
-    <!-- no translation found for wifi_notify_open_networks_summary (1793737931132127488) -->
-    <skip />
-    <!-- no translation found for wifi_password_incorrect_error (8656138222468900361) -->
-    <skip />
-    <!-- no translation found for wifi_generic_connection_error (4414845075108763948) -->
-    <skip />
-    <!-- no translation found for wifi_menu_advanced (7729886219986221918) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings_titlebar (6646153875184353089) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings_menu_save (5525488681356054899) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings_menu_cancel (4123436217014637229) -->
-    <skip />
-    <!-- no translation found for wifi_ip_settings_invalid_ip (1648124374575025870) -->
-    <skip />
-    <!-- no translation found for wifi_use_static_ip (4076793026334955338) -->
-    <skip />
-    <!-- no translation found for wifi_ip_address (6067958502872259392) -->
-    <skip />
-    <!-- no translation found for wifi_dns1 (7502077213876989613) -->
-    <skip />
-    <!-- no translation found for wifi_dns2 (3296825469895827273) -->
-    <skip />
-    <!-- no translation found for wifi_gateway (393330487055540831) -->
-    <skip />
-    <!-- no translation found for wifi_netmask (6024777305439519433) -->
-    <skip />
-    <!-- no translation found for wifi_context_menu_connect (3348366738100644008) -->
-    <skip />
-    <!-- no translation found for wifi_context_menu_forget (5844111744505938081) -->
-    <skip />
-    <!-- no translation found for wifi_context_menu_change_password (7074463790535015442) -->
-    <skip />
-    <!-- no translation found for wifi_advanced_titlebar (7352048185262676955) -->
-    <skip />
-    <!-- no translation found for wifi_setting_num_channels_title (4302664253747096207) -->
-    <skip />
-    <!-- no translation found for wifi_setting_num_channels_summary (5137058932628594680) -->
-    <skip />
-    <!-- no translation found for wifi_setting_num_channels_error (581404310349899492) -->
-    <skip />
-    <!-- no translation found for wifi_setting_num_channels_channel_phrase (8341967925173918983) -->
-    <skip />
-    <string name="fragment_status_scanning">"Scannen"</string>
-    <string name="fragment_status_connecting">"Bezig met verbinding maken met %1$s"</string>
-    <string name="fragment_status_authenticating">"Controleren met %1$s"</string>
-    <string name="fragment_status_obtaining_ip">"Ip-adres wordt verkregen van %1$s"</string>
-    <string name="fragment_status_connected">"Verbonden met %1$s"</string>
-    <string name="fragment_status_disconnecting">"Verbinding met %1$s wordt verbroken"</string>
-    <string name="fragment_status_disconnected">"Verbinding verbroken"</string>
-    <string name="fragment_status_failed">"Mislukt"</string>
-    <string name="status_scanning">"Scannen"</string>
-    <string name="status_connecting">"Verbinding"</string>
-    <string name="status_authenticating">"Bezig met verifiëren"</string>
-    <string name="status_obtaining_ip">"Bezig met verkrijgen van ip-adres"</string>
-    <string name="status_connected">"Verbonden"</string>
-    <string name="status_disconnecting">"Verbinding wordt verbroken"</string>
-    <string name="status_disconnected">"Verbinding verbroken"</string>
-    <string name="status_failed">"Mislukt"</string>
-    <!-- no translation found for sound_and_display_settings (4749118288236939460) -->
-    <skip />
-    <!-- no translation found for sound_settings (2706184235211157339) -->
-    <skip />
-    <!-- no translation found for sound_and_display_settings_summary (3672623202659031178) -->
-    <skip />
-    <string name="silent_mode_title">"Stil"</string>
-    <!-- no translation found for silent_mode_summary (6135093989634963053) -->
-    <skip />
-    <string name="ringtone_title">"Telefoonbeltoon"</string>
-    <!-- no translation found for ringtone_summary (1766080371183553822) -->
-    <skip />
-    <string name="ring_volume_title">"Belvolume"</string>
-    <!-- no translation found for ring_volume_summary (8107485240454889544) -->
-    <skip />
-    <!-- no translation found for vibrate_title (4376574310180696114) -->
-    <skip />
-    <!-- no translation found for vibrate_summary (6788068739601216797) -->
-    <skip />
-    <string name="notification_sound_title">"Meldingsbeltonen"</string>
-    <!-- no translation found for notification_sound_summary (7617168477811163700) -->
-    <skip />
-    <string name="notification_sound_dialog_title">"Meldingsbeltonen selecteren"</string>
-    <!-- no translation found for media_volume_title (1693540506432790482) -->
-    <skip />
-    <!-- no translation found for media_volume_summary (7399719776785079493) -->
-    <skip />
-    <!-- no translation found for dtmf_tone_enable_title (5173416183471867551) -->
-    <skip />
-    <!-- no translation found for dtmf_tone_enable_summary_on (7206798183944836534) -->
-    <skip />
-    <!-- no translation found for dtmf_tone_enable_summary_off (1555390648905350809) -->
-    <skip />
-    <!-- no translation found for sound_effects_enable_title (1955885794556255214) -->
-    <skip />
-    <!-- no translation found for sound_effects_enable_summary_on (1491009278452582375) -->
-    <skip />
-    <!-- no translation found for sound_effects_enable_summary_off (1932117674347216086) -->
-    <skip />
-    <string name="sync_settings">"Synchronisatie"</string>
-    <!-- no translation found for sync_settings_summary (2105151329390814783) -->
-    <skip />
-    <!-- no translation found for sync_too_many_deletes (5404332736593108449) -->
-    <skip />
-    <!-- no translation found for sync_automatically (1757054007777364379) -->
-    <skip />
-    <string name="sync_enabled">"Synchroniseren met Google-server ingeschakeld"</string>
-    <string name="sync_disabled">"Uit"</string>
-    <string name="sync_menu_sync_now">"Nu synchroniseren"</string>
-    <string name="sync_menu_sync_cancel">"Synchroniseren annuleren"</string>
-    <string name="sync_gmail">"Gmail"</string>
-    <string name="sync_calendar">"Agenda"</string>
-    <string name="sync_contacts">"Contacten"</string>
-    <!-- no translation found for sync_too_many_deletes_desc (4152554451720380120) -->
-    <skip />
-    <!-- no translation found for sync_really_delete (8529530859370540061) -->
-    <skip />
-    <!-- no translation found for sync_undo_deletes (5506677219430968015) -->
-    <skip />
-    <!-- no translation found for sync_do_nothing (8346666920786786758) -->
-    <skip />
-    <!-- no translation found for sync_is_failing (427555999473172925) -->
-    <skip />
-    <!-- no translation found for sync_plug (7544937220884084907) -->
-    <skip />
-    <string name="display_settings">"Scherm"</string>
-    <!-- no translation found for animations_title (8735876378664711924) -->
-    <skip />
-    <!-- no translation found for animations_summary_on (4910047473170373768) -->
-    <skip />
-    <!-- no translation found for animations_summary_off (7454248311417075336) -->
-    <skip />
-    <string name="brightness">"Helderheid"</string>
-    <!-- no translation found for screen_timeout (8939204183998677539) -->
-    <skip />
-    <string name="dim_screen">"Scherm dimmen"</string>
-    <string name="sim_lock_settings">"SIM-kaartblokkering"</string>
-    <!-- no translation found for sim_lock_settings_category (5039441655358781230) -->
-    <skip />
-    <string name="sim_lock_settings_title">"SIM-blokkeerinstellingen"</string>
-    <string name="sim_pin_toggle">"SIM-kaartblokkering"</string>
-    <string name="sim_lock_on">"SIM-kaartblokkering aan"</string>
-    <string name="sim_lock_off">"SIM-kaartblokkering uit"</string>
-    <string name="sim_pin_change">"Pincode veranderen"</string>
-    <string name="sim_enter_pin">"SIM-pincode invoeren"</string>
-    <string name="sim_enable_sim_lock">"SIM-kaartblokkering inschakelen"</string>
-    <string name="sim_disable_sim_lock">"SIM-kaartblokkering uitschakelen"</string>
-    <string name="sim_enter_old">"Oude pincode invoeren"</string>
-    <string name="sim_enter_new">"Nieuwe pincode invoeren"</string>
-    <string name="sim_reenter_new">"Voer nieuwe pincode opnieuw in"</string>
-    <string name="sim_change_pin">"SIM-pincode wijzigen"</string>
-    <string name="sim_bad_pin">"Let op: Onjuiste pincode"</string>
-    <string name="sim_pins_dont_match">"Let op: Pincodes verschillen"</string>
-    <string name="sim_change_failed">"Veranderen van pincode mislukt"\n"Wellicht onjuiste pincode"</string>
-    <string name="sim_change_succeeded">"Veranderen van SIM-pincode gelukt"</string>
-    <string name="sim_lock_failed">"Veranderen blokkeringsstatus van SIM-kaart mislukt"\n"Wellicht onjuist pincode"</string>
-    <string name="sim_enter_ok">"OK"</string>
-    <string name="sim_enter_cancel">"Annuleren"</string>
-    <string name="device_info_settings">"Toestelinfo"</string>
-    <!-- no translation found for system_update_settings_list_item_title (6730200310196695815) -->
-    <skip />
-    <!-- no translation found for system_update_settings_list_item_summary (6739352515982816664) -->
-    <skip />
-    <string name="firmware_version">"Firmwareversie"</string>
-    <!-- no translation found for model_number (4107796374489189882) -->
-    <skip />
-    <string name="baseband_version">"Basebandversie"</string>
-    <!-- no translation found for kernel_version (55378504731737055) -->
-    <skip />
-    <!-- no translation found for build_number (1198654854394859525) -->
-    <skip />
-    <!-- no translation found for device_info_not_available (6218382614449625943) -->
-    <skip />
-    <!-- no translation found for device_status_activity_title (7855799759928692423) -->
-    <skip />
-    <string name="device_status">"Status"</string>
-    <string name="device_status_summary">"IMEI, telefoonnummer, signaal, enz."</string>
-    <!-- no translation found for storage_settings_title (7861753874184164833) -->
-    <skip />
-    <!-- no translation found for storage_settings_summary (1416818376253802300) -->
-    <skip />
-    <string name="status_number">"Telefoonnummer"</string>
-    <string name="status_network_type">"Netwerktype"</string>
-    <string name="status_data_state">"Gegevenstoegang"</string>
-    <string name="status_service_state">"Dienststatus"</string>
-    <string name="status_signal_strength">"Signaalsterkte"</string>
-    <string name="status_roaming">"Roaming"</string>
-    <string name="status_operator">"Netwerk"</string>
-    <!-- no translation found for status_wifi_mac_address (6992831729694423293) -->
-    <skip />
-    <!-- no translation found for status_bt_address (504373592762785867) -->
-    <skip />
-    <!-- no translation found for status_unavailable (6051510065892966154) -->
-    <skip />
-    <string name="status_up_time">"Tijd geactiveerd"</string>
-    <string name="status_awake_time">"Opwektijd"</string>
-    <!-- no translation found for internal_memory (7561409402817962159) -->
-    <skip />
-    <!-- no translation found for sd_memory (1795406535114313767) -->
-    <skip />
-    <!-- no translation found for memory_available (2899158225295363424) -->
-    <skip />
-    <!-- no translation found for memory_size (427803224818498885) -->
-    <skip />
-    <!-- no translation found for sd_eject (5921913949386442101) -->
-    <skip />
-    <string name="sd_unavailable">"Niet beschikbaar"</string>
-    <string name="read_only">" (Alleen lezen)"</string>
-    <!-- no translation found for battery_status_title (4908729478929871241) -->
-    <skip />
-    <!-- no translation found for battery_level_title (7696801820825704716) -->
-    <skip />
-    <string name="apn_settings">"APN"</string>
-    <string name="apn_edit">"Toegangspunt bewerken"</string>
-    <string name="apn_not_set">"&lt;Niet ingesteld&gt;"</string>
-    <string name="apn_name">"Naam"</string>
-    <string name="apn_apn">"APN"</string>
-    <string name="apn_http_proxy">"Proxy"</string>
-    <string name="apn_http_port">"Poort"</string>
-    <string name="apn_user">"Gebruikersnaam"</string>
-    <string name="apn_password">"Wachtwoord"</string>
-    <string name="apn_server">"Server"</string>
-    <string name="apn_mmsc">"MMSC"</string>
-    <string name="apn_mms_proxy">"MMS-proxy"</string>
-    <string name="apn_mms_port">"MMS-poort"</string>
-    <string name="apn_mcc">"MCC"</string>
-    <string name="apn_mnc">"MNC"</string>
-    <!-- no translation found for apn_type (2506383481268652319) -->
-    <skip />
-    <string name="menu_delete">"APN verwijderen"</string>
-    <string name="menu_new">"Nieuwe APN"</string>
-    <string name="menu_save">"Opslaan"</string>
-    <string name="menu_cancel">"Wissen"</string>
-    <string name="error_title">"Ongeldige gegevens"</string>
-    <string name="error_name_empty">"Naam kan niet blanco zijn"</string>
-    <string name="error_apn_empty">"APN kan niet blanco zijn"</string>
-    <string name="error_mcc_not3">"MMC-veld moet 3 tekens zijn"</string>
-    <string name="error_mnc_not23">"MMC-veld moet 2 of 3 tekens zijn"</string>
-    <string name="master_clear_title">"Hoofd wissen"</string>
-    <!-- no translation found for master_clear_summary (2468534382451112879) -->
-    <skip />
-    <string name="master_clear_desc">"Herstelt de oorspronkelijke fabriekswaarden van het toestel, waarbij alle gegevens en gedownloade toepassingen worden gewist"</string>
-    <string name="master_clear_button_text">"Apparaat opnieuw instellen"</string>
-    <string name="master_clear_final_desc">"Toestel resetten, waarbij alle gegevens en toepassingen worden gewist? Handeling kan niet worden teruggedraaid!"</string>
-    <string name="master_clear_final_button_text">"Alles wissen"</string>
-    <string name="master_clear_gesture_prompt">"Teken het blokkeringspatroon"</string>
-    <string name="master_clear_gesture_explanation">"U moet het blokkeringspatroon tekeken om een toestelreset goed te keuren"</string>
-    <string name="master_clear_failed">"Geen reset uitgevoerd omdat de service Systeem wissen niet beschikbaar is"</string>
-    <string name="call_settings_title">"Belinstellingen"</string>
-    <!-- no translation found for call_settings_summary (3446216896482844237) -->
-    <skip />
-    <string name="network_settings_title">"Netwerkinstellingen"</string>
-    <!-- no translation found for network_settings_summary (8031949240036716110) -->
-    <skip />
-    <!-- no translation found for location_title (4501749309437121375) -->
-    <skip />
-    <string name="location_network_based">"Gebaseerd op netwerk"</string>
-    <!-- no translation found for location_networks_disabled (7048471014395968941) -->
-    <skip />
-    <string name="location_neighborhood_level">"Nauwkeurigheid op buurtniveau"</string>
-    <string name="location_gps">"Gebaseerd op gps"</string>
-    <string name="location_street_level">"Nauwkeurigheid op straatniveau"</string>
-    <!-- no translation found for location_gps_disabled (4004885356658024277) -->
-    <skip />
-    <!-- no translation found for about_settings (1468182090257585152) -->
-    <skip />
-    <!-- no translation found for about_settings_summary (7669309646592260587) -->
-    <skip />
-    <!-- no translation found for legal_information (6712607847710471677) -->
-    <skip />
-    <!-- no translation found for contributors_title (4798193298012318879) -->
-    <skip />
-    <!-- no translation found for copyright_title (2179228277436615247) -->
-    <skip />
-    <!-- no translation found for license_title (819526735187376873) -->
-    <skip />
-    <!-- no translation found for terms_title (7807601861320706623) -->
-    <skip />
-    <!-- no translation found for settings_license_activity_title (7912723098716795094) -->
-    <skip />
-    <!-- no translation found for settings_license_activity_unavailable (2081311778550755077) -->
-    <skip />
-    <!-- no translation found for settings_license_activity_loading (1663818560123999889) -->
-    <skip />
-    <string name="lock_settings_title">"Blokkeergebaar"</string>
-    <string name="lockpattern_change_lock_pattern_label">"Patroon voor veranderen blokkering"</string>
-    <string name="lockpattern_need_to_unlock">"Opgeslagen patroon bevestigen:"</string>
-    <string name="lockpattern_need_to_unlock_wrong">"Onjuist! Nogmaals proberen:"</string>
-    <string name="lockpattern_recording_intro_header">"Teken een patroon om als codeblokkering te gebruiken:"</string>
-    <string name="lockpattern_recording_intro_footer">"Druk op Menu voor hulp"</string>
-    <string name="lockpattern_recording_inprogress">"Til de vinger op als u klaar bent"</string>
-    <!-- no translation found for lockpattern_recording_incorrect_too_short (8234374450664107990) -->
-    <skip />
-    <string name="lockpattern_pattern_entered_header">"U selecteerde:"</string>
-    <!-- no translation found for lockpattern_need_to_confirm (6414172006294337771) -->
-    <skip />
-    <string name="lockpattern_pattern_confirmed_header">"Het nieuwe blokkeringspatroon:"</string>
-    <string name="lockpattern_confirm_button_text">"Bevestigen"</string>
-    <string name="lockpattern_restart_button_text">"Opnieuw starten"</string>
-    <!-- no translation found for lockpattern_retry_button_text (7695474740059017745) -->
-    <skip />
-    <!-- no translation found for lockpattern_continue_button_text (1077275957953266837) -->
-    <skip />
-    <string name="lockpattern_settings_title">"Blokkeergebaar"</string>
-    <string name="lockpattern_settings_enable_title">"Blokkeergebaar"</string>
-    <string name="lockpattern_settings_enable_summary">"Gebaar vereisen voor vrijgeven"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title">"Zichtbaar patroon gebruiken"</string>
-    <string name="lockpattern_settings_choose_lock_pattern">"Patroon voor blokkeringsgebaar selecteren"</string>
-    <string name="lockpattern_settings_change_lock_pattern">"Gebaarpatroon voor veranderen blokkering"</string>
-    <string name="lockpattern_settings_help_how_to_record">"Het opnemen van een blokkeringspatroon"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_header">"Te veel onjuiste bevestigingspogingen"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer">"Probeer opnieuw over <xliff:g id="NUMBER">%d</xliff:g> seconden"</string>
-    <!-- no translation found for skip_button_label (4850708311344393218) -->
-    <skip />
-    <!-- no translation found for next_button_label (3149701380025478958) -->
-    <skip />
-    <!-- no translation found for lock_title (999106562425756837) -->
-    <skip />
-    <!-- no translation found for lock_intro_message (2382351248538397170) -->
-    <skip />
-    <!-- no translation found for lock_example_title (6261868148302088973) -->
-    <skip />
-    <!-- no translation found for lock_example_message (2583534765034914458) -->
-    <skip />
-    <!-- no translation found for manageapplications_settings_title (3359899792647354589) -->
-    <skip />
-    <!-- no translation found for applications_settings (6104314134883460574) -->
-    <skip />
-    <!-- no translation found for applications_settings_summary (7666960391957493763) -->
-    <skip />
-    <!-- no translation found for applications_settings_header (6167136604757235210) -->
-    <skip />
-    <!-- no translation found for install_applications (8586540661161378543) -->
-    <skip />
-    <!-- no translation found for install_unknown_applications (8694019339326383901) -->
-    <skip />
-    <!-- no translation found for install_all_warning (5826871395153503952) -->
-    <skip />
-    <!-- no translation found for manage_applications_title (8288310040777485758) -->
-    <skip />
-    <!-- no translation found for application_info_label (605192869687093760) -->
-    <skip />
-    <!-- no translation found for storage_label (8765276782501761971) -->
-    <skip />
-    <!-- no translation found for auto_launch_label (3546876666453498673) -->
-    <skip />
-    <!-- no translation found for permissions_label (3244346920180368862) -->
-    <skip />
-    <!-- no translation found for total_size_label (5016115699600749568) -->
-    <skip />
-    <!-- no translation found for application_size_label (5378963933449396413) -->
-    <skip />
-    <!-- no translation found for data_size_label (6038126657652457179) -->
-    <skip />
-    <!-- no translation found for uninstall_text (2322009518449651787) -->
-    <skip />
-    <!-- no translation found for clear_user_data_text (3586758620250813061) -->
-    <skip />
-    <!-- no translation found for auto_launch_enable_text (8228619838865933982) -->
-    <skip />
-    <!-- no translation found for auto_launch_disable_text (4696687016762486484) -->
-    <skip />
-    <!-- no translation found for clear_activities (2399981667625036009) -->
-    <skip />
-    <!-- no translation found for unknown (7966307317466394761) -->
-    <skip />
-    <!-- no translation found for sort_order_alpha (210746743398042077) -->
-    <skip />
-    <!-- no translation found for sort_order_size (2716777274377923612) -->
-    <skip />
-    <!-- no translation found for manage_space_text (3118726017144542336) -->
-    <skip />
-    <!-- no translation found for filter_apps_all (5819127882791374920) -->
-    <skip />
-    <!-- no translation found for filter_apps_third_party (8693065498520334174) -->
-    <skip />
-    <!-- no translation found for filter_apps_running (2019159142681656258) -->
-    <skip />
-    <!-- no translation found for loading (5170696093820794830) -->
-    <skip />
-    <!-- no translation found for recompute_size (8376294373548662083) -->
-    <skip />
-    <!-- no translation found for clear_data_dlg_title (2115093619616088799) -->
-    <skip />
-    <!-- no translation found for clear_data_dlg_text (3004273956481932846) -->
-    <skip />
-    <!-- no translation found for dlg_ok (2225130755859653348) -->
-    <skip />
-    <!-- no translation found for dlg_cancel (8597172015374919396) -->
-    <skip />
-    <!-- no translation found for app_not_found_dlg_title (6649900521951617898) -->
-    <skip />
-    <!-- no translation found for app_not_found_dlg_text (6893475426667174751) -->
-    <skip />
-    <!-- no translation found for clear_data_failed (3040984234884359027) -->
-    <skip />
-    <!-- no translation found for security_settings_desc (5898339748632998613) -->
-    <skip />
-    <!-- no translation found for default_app_desc (3475613003133497043) -->
-    <skip />
-    <!-- no translation found for computing_size (7350089935999085554) -->
-    <skip />
-    <!-- no translation found for invalid_size_value (3054945647487201471) -->
-    <skip />
-    <!-- no translation found for language_settings (7247557040404006341) -->
-    <skip />
-    <!-- no translation found for language_settings_summary (721948806318958691) -->
-    <skip />
-    <!-- no translation found for language_category (6646529166552376418) -->
-    <skip />
-    <!-- no translation found for text_category (3133311779500246731) -->
-    <skip />
-    <!-- no translation found for phone_language (4084332836028530631) -->
-    <skip />
-    <!-- no translation found for auto_replace (6134508433464846627) -->
-    <skip />
-    <!-- no translation found for auto_replace_summary (1016177921245107750) -->
-    <skip />
-    <!-- no translation found for auto_caps (6021984352657087728) -->
-    <skip />
-    <!-- no translation found for auto_caps_summary (4783973594319542220) -->
-    <skip />
-    <!-- no translation found for auto_punctuate (2819742922158924703) -->
-    <skip />
-    <!-- no translation found for auto_punctuate_summary (2664143621323054924) -->
-    <skip />
-    <!-- no translation found for show_password (2353636034424349266) -->
-    <skip />
-    <!-- no translation found for show_password_summary (3920555488855590831) -->
-    <skip />
-    <!-- no translation found for testing (555268605244514909) -->
-    <skip />
-    <!-- no translation found for testing_phone_info (8718517606602144606) -->
-    <skip />
-    <!-- no translation found for testing_battery_info (3826036256683980425) -->
-    <skip />
-    <!-- no translation found for quick_launch_title (5423323579273213815) -->
-    <skip />
-    <!-- no translation found for quick_launch_summary (1272194567210324017) -->
-    <skip />
-    <!-- no translation found for quick_launch_assign_application (5949445664563354321) -->
-    <skip />
-    <!-- no translation found for quick_launch_no_shortcut (5958195604101558965) -->
-    <skip />
-    <!-- no translation found for quick_launch_shortcut (1115195051591830635) -->
-    <skip />
-    <!-- no translation found for quick_launch_clear_dialog_title (5217130241215296612) -->
-    <skip />
-    <!-- no translation found for quick_launch_clear_dialog_message (3420665419624963430) -->
-    <skip />
-    <!-- no translation found for quick_launch_clear_ok_button (2442832413597511429) -->
-    <skip />
-    <!-- no translation found for quick_launch_clear_cancel_button (1437354385792055993) -->
-    <skip />
-    <!-- no translation found for quick_launch_display_mode_applications (6570683843184675363) -->
-    <skip />
-    <!-- no translation found for quick_launch_display_mode_shortcuts (6642750364678074004) -->
-    <skip />
-    <!-- no translation found for input_methods_settings_title (1752662012056721926) -->
-    <skip />
-    <!-- no translation found for input_methods_settings_summary (5481367119142131313) -->
-    <skip />
-    <!-- no translation found for development_settings_title (4671731485005432632) -->
-    <skip />
-    <!-- no translation found for development_settings_summary (5518361138194831299) -->
-    <skip />
-    <!-- no translation found for enable_adb (7770070343289262572) -->
-    <skip />
-    <!-- no translation found for enable_adb_summary (1498997582065835981) -->
-    <skip />
-    <!-- no translation found for keep_screen_on (5805533478834516956) -->
-    <skip />
-    <!-- no translation found for keep_screen_on_summary (5703353541069794974) -->
-    <skip />
-    <!-- no translation found for allow_mock_location (6204808904743157937) -->
-    <skip />
-    <!-- no translation found for allow_mock_location_summary (3154837501223277592) -->
-    <skip />
-</resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index dadf564..06f9eb2 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -53,4 +53,15 @@
     <!-- no translation found for wifi_sleep_policy_entries:0 (3804733751095821976) -->
     <!-- no translation found for wifi_sleep_policy_entries:1 (1549288661423279207) -->
     <!-- no translation found for wifi_sleep_policy_entries:2 (1986753720941888596) -->
+    <!-- no translation found for battery_history_type_spinner:0 (2372160040893842611) -->
+    <!-- no translation found for battery_history_type_spinner:1 (7042951832385599110) -->
+    <!-- no translation found for battery_history_type_spinner:2 (7643330117743172161) -->
+    <!-- no translation found for battery_history_type_spinner:3 (7984071435080498080) -->
+    <!-- no translation found for battery_history_which_spinner:0 (8777827398176661463) -->
+    <!-- no translation found for battery_history_which_spinner:1 (2351620008414691945) -->
+    <!-- no translation found for battery_history_which_spinner:2 (1233325583071371898) -->
+    <!-- no translation found for battery_history_which_spinner:3 (524850874274605031) -->
+    <!-- no translation found for usage_stats_display_order_types:0 (9077371706468756228) -->
+    <!-- no translation found for usage_stats_display_order_types:1 (1908750532762193304) -->
+    <!-- no translation found for usage_stats_display_order_types:2 (1213951670006606353) -->
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9ed771f..a468001 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -16,9 +16,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="device_info_default">"Onbekend"</string>
-    <string name="device_info_uptime">"Bedrijfstijd"</string>
-    <string name="device_info_awaketime">"Stand-bytijd"</string>
-    <string name="device_info_asleeptime">"Slaaptijd"</string>
     <string name="turn_on_radio">"Radio inschakelen"</string>
     <string name="turn_off_radio">"Radio uitschakelen"</string>
     <string name="turn_on_qxdm">"QXDM SD-logboek inschakelen"</string>
@@ -52,14 +49,13 @@
     <string name="radioInfo_lac">"LAC"</string>
     <string name="radioInfo_cid">"CID"</string>
     <string name="sdcard_unmount">"SD-kaart ontkoppelen"</string>
+    <!-- no translation found for sdcard_format (362497552060004057) -->
+    <skip />
     <string name="small_font">"Klein"</string>
     <string name="medium_font">"Gemiddeld"</string>
     <string name="large_font">"Groot"</string>
     <string name="font_size_save">"OK"</string>
     <string name="sdcard_setting">"SD-kaart"</string>
-    <string name="screen_off_timeout_label">"Nooit time-out tijdens opladen"</string>
-    <string name="stay_on">"Scherm altijd aan tijdens het opladen"</string>
-    <string name="app_launcher_newView_text">"Nieuwe AppLauncher"</string>
     <string name="battery_info_status_label">"Accustatus:"</string>
     <string name="battery_info_scale_label">"Accuschaal:"</string>
     <string name="battery_info_level_label">"Accuniveau:"</string>
@@ -87,11 +83,6 @@
     <string name="battery_info_health_over_voltage">"Overspanning"</string>
     <string name="battery_info_health_unspecified_failure">"Onbekende fout"</string>
     <string name="bluetooth">"Bluetooth"</string>
-    <string name="bluetooth_stopping">"Bluetooth wordt gestopt..."</string>
-    <string name="bluetooth_disabled">"Bluetooth inschakelen"</string>
-    <!-- no translation found for bluetooth_enabled (314506563815464155) -->
-    <skip />
-    <string name="bluetooth_enabling">"Bluetooth inschakelen…"</string>
     <string name="bluetooth_visibility">"Kan worden gevonden"</string>
     <string name="bluetooth_is_discoverable">"Kan gedurende <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> seconden worden gevonden…"</string>
     <string name="bluetooth_not_discoverable">"Zorgen dat het apparaat kan worden gevonden"</string>
@@ -99,7 +90,6 @@
     <string name="bluetooth_device_name">"Apparaatnaam"</string>
     <string name="bluetooth_name_not_set">"Geen naam ingesteld, accountnaam wordt gebruikt"</string>
     <string name="bluetooth_scan_for_devices">"Scannen naar apparaten"</string>
-    <string name="bluetooth_clear_list">"Apparaatlijst wissen"</string>
     <string name="bluetooth_disconnect_blank">"Verbinding met <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt verbroken."</string>
     <string name="bluetooth_connected">"Verbonden"</string>
     <string name="bluetooth_disconnected">"Verbinding verbroken"</string>
@@ -108,17 +98,9 @@
     <!-- no translation found for bluetooth_unknown (644716244548801421) -->
     <skip />
     <string name="bluetooth_not_connected">"Koppelen met dit apparaat"</string>
-    <string name="bluetooth_failed_to_enable">"Kan Bluetooth niet inschakelen"</string>
     <string name="bluetooth_pairing">"Koppelen..."</string>
-    <string name="failed_to_pair">"Kan niet koppelen met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="failed_to_connect">"Kan geen verbinding maken met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_paired">"Gekoppeld"</string>
-    <string name="bluetooth_paired_not_nearby">"Gekoppeld"</string>
     <string name="bluetooth_device">"handsfree/headset"</string>
-    <string name="bluetooth_disconnect">"Verbinding verbreken"</string>
-    <string name="bluetooth_connect">"Verbinden"</string>
-    <string name="bluetooth_unpair">"Koppeling ongedaan maken"</string>
-    <string name="bluetooth_pair">"Koppelen"</string>
     <string name="progress_scanning">"Scannen"</string>
     <string name="bluetooth_notif_ticker">"Bluetooth-koppelingsverzoek"</string>
     <string name="bluetooth_notif_title">"Koppelingsverzoek"</string>
@@ -136,16 +118,6 @@
     <string name="intent_sender_startactivity_text">"<xliff:g id="ACTIVITY">activity</xliff:g> starten"</string>
     <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label">"Account:"</string>
-    <string name="keyguard_pw_mod_text">"Blokkeringspatroon selecteren"</string>
-    <string name="keyguard_pin_mod_text">"PIN-code wijzigen"</string>
-    <string name="keyguard_label">"Toetsblokkering"</string>
-    <string name="keyguard_sim_pin_label">"SIM PIN-code"</string>
-    <string name="keyguard_password_old_password_error_text">"Het oude wachtwoord dat u heeft ingevoerd, is onjuist. Probeer het opnieuw."</string>
-    <string name="keyguard_password_button_text">"OK"</string>
-    <string name="keyguard_password_confirm_new_label">"Nieuw wachtwoord bevestigen:"</string>
-    <string name="keyguard_password_new_label">"Nieuw wachtwoord:"</string>
-    <string name="keyguard_password_old_label">"Oud wachtwoord:"</string>
-    <string name="keyguard_password_mismatch_error_text">"De twee wachtwoorden komen niet overeen. Probeer het opnieuw."</string>
     <string name="proxy_clear_text">"Wissen"</string>
     <string name="proxy_port_label">"Poort"</string>
     <string name="proxy_defaultView_text">"Standaardwaarden herstellen"</string>
@@ -188,15 +160,13 @@
     <string name="radio_info_smsc_label">"SMSC:"</string>
     <string name="radio_info_smsc_update_label">"Bijwerken"</string>
     <string name="radio_info_smsc_refresh_label">"Vernieuwen"</string>
+    <!-- no translation found for radio_info_toggle_dns_check_label (8292252930563286858) -->
+    <skip />
     <string name="band_mode_title">"GSM/UMTS-band instellen"</string>
     <string name="band_mode_loading">"Bandlijst laden..."</string>
     <string name="band_mode_set">"Instellen"</string>
     <string name="band_mode_failed">"Mislukt"</string>
     <string name="band_mode_succeeded">"Geslaagd"</string>
-    <string name="ringer_volume_ringer_mode_label">"Beltoonmodus"</string>
-    <string name="ringer_volume_screen_increasing_text">"Belvolume verhogen"</string>
-    <string name="ringer_volume_ringtone_label">"Beltoon"</string>
-    <string name="ringer_volume_instructions">"Volumetoetsen gebruiken voor aanpassing belvolume"</string>
     <string name="sdcard_changes_instructions">"Wijzigingen worden van kracht als de USB-kabel opnieuw wordt aangesloten"</string>
     <string name="sdcard_settings_screen_mass_storage_text">"USB-massaopslag inschakelen"</string>
     <string name="sdcard_settings_total_bytes_label">"Totaal aantal bytes:"</string>
@@ -208,20 +178,6 @@
     <string name="sdcard_settings_used_bytes_label">"Gebruikte bytes:"</string>
     <string name="sdcard_settings_scanning_status">"SD-kaart scannen op media..."</string>
     <string name="sdcard_settings_read_only_status">"Gekoppelde SD-kaart alleen-lezen"</string>
-    <string name="sdcard_removal_alert_title">"Verwijdering onveilige SD-kaart!"</string>
-    <string name="sdcard_unmountable_alert_title">"SD-kaart onleesbaar"</string>
-    <string name="telephony_user_label">"Gebruiker:"</string>
-    <string name="telephony_server_label">"Server:"</string>
-    <string name="telephony_name_label">"Naam:"</string>
-    <string name="telephony_mmsc_label">"MMSC:"</string>
-    <string name="telephony_apn_label">"APN:"</string>
-    <string name="telephony_mcc_label">"MCC:"</string>
-    <string name="telephony_port_label">"Poort:"</string>
-    <string name="telephony_password_label">"Wachtwoord:"</string>
-    <string name="telephony_proxy_label">"Proxy:"</string>
-    <string name="telephony_mnc_label">"MNC:"</string>
-    <string name="telephony_mmsproxy_label">"MMS-proxy:"</string>
-    <string name="telephony_mmsport_label">"MMS-poort:"</string>
     <string name="next_label">"Volgende"</string>
     <string name="language_picker_title">"Landinstelling"</string>
     <string name="select_your_language">"Uw taal selecteren"</string>
@@ -264,23 +220,12 @@
     <string name="bluetooth_settings_summary">"Verbindingen beheren, apparaatnaam en vindbaarheid instellen"</string>
     <string name="bluetooth_pin_entry">"Bluetooth-koppelingsverzoek"</string>
     <string name="bluetooth_device_info">"Bluetooth-apparaatinfo"</string>
-    <string name="bluetooth_pairing_msg">"Koppelen..."</string>
     <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Typ de PIN-code om te koppelen."\n"(Probeer 0000 of 1234.)"</string>
     <string name="bluetooth_error_title">"Let op"</string>
     <string name="bluetooth_pairing_error_message">"Er is een probleem opgetreden bij het koppelen met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_alternate_error_message">"Er is een probleem opgetreden bij het koppelen met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Probeer een andere PIN-code."</string>
     <string name="bluetooth_pairing_pin_error_message">"Er is een probleem opgetreden bij het koppelen met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, omdat de opgegeven PIN-code onjuist is."</string>
     <string name="bluetooth_connecting_error_message">"Er is een probleem opgetreden bij het verbinden met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_new_data">"Nieuwe gegevens invoeren"</string>
-    <string name="bluetooth_new_data_confirm">"OK"</string>
-    <string name="bluetooth_new_data_cancel">"Annuleren"</string>
-    <string name="bluetooth_scan_for_new_devices">"Scannen naar nieuwe apparaten..."</string>
-    <string name="bluetooth_discoverability_panel_title">"Maken..."</string>
-    <string name="bluetooth_discoverable">"Kan gedurende <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> seconden worden gevonden"</string>
-    <string name="bluetooth_connectable">"Alleen voor verbinding"</string>
-    <string name="bluetooth_neither">"Kan niet worden gevonden of verbonden"</string>
     <string name="bluetooth_preference_scan_title">"Scannen naar apparaten"</string>
-    <string name="bluetooth_preference_scan_summary">"Apparaten zoeken om mee te koppelen"</string>
     <string name="bluetooth_device_context_connect">"Verbinden"</string>
     <string name="bluetooth_device_context_disconnect">"Verbinding verbreken"</string>
     <string name="bluetooth_device_context_pair_connect">"Koppelen en verbinden"</string>
@@ -420,32 +365,24 @@
     <string name="sound_effects_enable_title">"Hoorbare selectie"</string>
     <string name="sound_effects_enable_summary_on">"Geluid afspelen bij schermselectie"</string>
     <string name="sound_effects_enable_summary_off">"Geluid afspelen bij schermselectie"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_title (1008791464029179529) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (426729807044947187) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (803791141563778934) -->
+    <skip />
     <string name="sync_settings">"Gegevenssynchronisatie"</string>
     <string name="sync_settings_summary">"Selecteren welke toepassingen worden gesynchroniseerd"</string>
-    <string name="sync_settings_header_general_settings">"Algemene instellingen voor synchronisatie"</string>
-    <string name="sync_settings_header_application_settings">"Synchronatie-instellingen van de toepassing"</string>
-    <string name="sync_too_many_deletes">"Verwijderingslimiet overschreden"</string>
-    <string name="sync_automatically">"Automatische synchronisatie"</string>
-    <string name="sync_enabled">"Gegevens automatisch synchroniseren"</string>
-    <string name="sync_disabled">"Selecteer dit om gegevens automatisch te synchroniseren"</string>
-    <string name="sync_menu_sync_now">"Nu synchroniseren"</string>
-    <string name="sync_menu_sync_cancel">"Synchronisatie annuleren"</string>
-    <string name="sync_gmail">"Gmail"</string>
-    <string name="sync_calendar">"Agenda"</string>
-    <string name="sync_contacts">"Contactpersonen"</string>
-    <string name="sync_too_many_deletes_desc">"Er zijn <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> verwijderde items voor <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>, account <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>. Wat wilt u doen?"</string>
-    <string name="sync_really_delete">"De items verwijderen."</string>
-    <string name="sync_undo_deletes">"Verwijderingen ongedaan maken."</string>
-    <string name="sync_do_nothing">"Nu niets doen."</string>
-    <string name="sync_is_failing">"Er zijn momenteel problemen met de synchronisatie. Synchronisatie wordt snel opnieuw uitgevoerd."</string>
-    <string name="sync_plug"><font fgcolor="#ffffffff">"Welkom bij Google Sync!"</font>" "\n"Een benadering van Google voor de synchronisatie van gegevens, zodat u altijd en overal toegang heeft tot uw contactpersonen, afspraken en nog veel meer."</string>
     <string name="display_settings">"Instellingen weergeven"</string>
     <string name="animations_title">"Animatie"</string>
     <string name="animations_summary_on">"Animatie weergeven bij het openen/sluiten van vensters"</string>
     <string name="animations_summary_off">"Animatie weergeven bij het openen/sluiten van vensters"</string>
     <string name="brightness">"Helderheid"</string>
+    <!-- no translation found for brightness_summary (838917350127550703) -->
+    <skip />
     <string name="screen_timeout">"Time-out scherm"</string>
-    <string name="dim_screen">"Scherm dimmen"</string>
+    <!-- no translation found for screen_timeout_summary (2905757633140605334) -->
+    <skip />
     <string name="sim_lock_settings">"Instellingen SIM-kaartblokkering"</string>
     <string name="sim_lock_settings_category">"SIM-kaartblokkering instellen"</string>
     <string name="sim_lock_settings_title">"SIM-kaartblokkering"</string>
@@ -493,13 +430,24 @@
     <string name="status_wifi_mac_address">"Wi-Fi MAC-adres"</string>
     <string name="status_bt_address">"Bluetooth-adres"</string>
     <string name="status_unavailable">"Niet beschikbaar"</string>
+    <!-- no translation found for status_network_traffic_stats (2089739529980224804) -->
+    <skip />
+    <!-- no translation found for status_network_traffic_summary (1456797220417923108) -->
+    <skip />
     <string name="status_up_time">"Bedrijfstijd"</string>
     <string name="status_awake_time">"Stand-bytijd"</string>
     <string name="internal_memory">"Intern telefoongeheugen"</string>
     <string name="sd_memory">"SD-kaart"</string>
     <string name="memory_available">"Beschikbare ruimte"</string>
     <string name="memory_size">"Totale ruimte"</string>
-    <string name="sd_eject">"SD-kaart loskoppelen/verwijderen"</string>
+    <!-- no translation found for sd_eject (6915293408836853020) -->
+    <skip />
+    <!-- no translation found for sd_eject_summary (3315557796211542962) -->
+    <skip />
+    <!-- no translation found for sd_format (5448738337382712203) -->
+    <skip />
+    <!-- no translation found for sd_format_summary (6616491027883134004) -->
+    <skip />
     <string name="sd_unavailable">"Niet beschikbaar"</string>
     <string name="read_only">"(Alleen-lezen)"</string>
     <string name="battery_status_title">"Accustatus"</string>
@@ -538,6 +486,22 @@
     <string name="master_clear_gesture_prompt">"Teken uw deblokkeringspatroon"</string>
     <string name="master_clear_gesture_explanation">"U moet uw deblokkeringspatroon tekenen om het opnieuw instellen van de telefoon te bevestigen."</string>
     <string name="master_clear_failed">"Niet opnieuw ingesteld, omdat de service \'Systeem wissen\' niet beschikbaar is."</string>
+    <!-- no translation found for media_format_title (4671276096695789895) -->
+    <skip />
+    <!-- no translation found for media_format_summary (3805714639375830120) -->
+    <skip />
+    <!-- no translation found for media_format_desc (1142563222357820834) -->
+    <skip />
+    <!-- no translation found for media_format_button_text (370856400090190151) -->
+    <skip />
+    <!-- no translation found for media_format_final_desc (1776666694910717198) -->
+    <skip />
+    <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_prompt (3109349468816856670) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_explanation (4239529439389660159) -->
+    <skip />
     <string name="call_settings_title">"Oproepinstellingen"</string>
     <string name="call_settings_summary">"Voicemail, oproepen doorschakelen, wisselgesprek, beller-id instellen."</string>
     <string name="network_settings_title">"Mobiele netwerken"</string>
@@ -591,17 +555,25 @@
     <string name="lock_example_title">"Voorbeeldpatroon"</string>
     <string name="lock_example_message">"Verbind minimaal vier punten. "\n" "\n"Selecteer \'Volgende\' als u klaar bent om uw eigen patroon te tekenen."</string>
     <string name="manageapplications_settings_title">"Toepassingen beheren"</string>
+    <!-- no translation found for manageapplications_settings_summary (6097117021500651232) -->
+    <skip />
     <string name="applications_settings">"Toepassingen"</string>
     <string name="applications_settings_summary">"Toepassingen beheren, sneltoetsen voor snelstarten instellen"</string>
     <string name="applications_settings_header">"Toepassingsinstellingen"</string>
     <string name="install_applications">"Onbekende bronnen"</string>
     <string name="install_unknown_applications">"Installatie van andere toepassingen dan Market-toepassingen toestaan"</string>
     <string name="install_all_warning">"Uw telefoon en persoonlijke gegevens zijn gevoeliger voor aanvallen door toepassingen van onbekende bronnen. U gaat ermee akkoord dat u alleen verantwoordelijk bent voor enige schade aan uw telefoon of verlies van gegevens die voortkomen uit het gebruik van deze toepassingen."</string>
-    <string name="manage_applications_title">"Toepassingen beheren"</string>
     <string name="application_info_label">"Toepassingsinfo"</string>
     <string name="storage_label">"Opslagruimte"</string>
     <string name="auto_launch_label">"Standaard starten"</string>
     <string name="permissions_label">"Machtigingen"</string>
+    <string name="cache_header_label">"Cachegeheugen"</string>
+    <string name="clear_cache_btn_text">"Cache wissen"</string>
+    <string name="cache_size_label">"Cachegeheugen"</string>
+    <!-- no translation found for controls_label (7611113077086853799) -->
+    <skip />
+    <!-- no translation found for force_stop (7435006169872876756) -->
+    <skip />
     <string name="total_size_label">"Totaal"</string>
     <string name="application_size_label">"Toepassing"</string>
     <string name="data_size_label">"Gegevens"</string>
@@ -614,6 +586,10 @@
     <string name="sort_order_alpha">"Sorteren"</string>
     <string name="sort_order_size">"Sorteren op grootte"</string>
     <string name="manage_space_text">"Ruimte beheren"</string>
+    <!-- no translation found for filter (2018011724373033887) -->
+    <skip />
+    <!-- no translation found for filter_dlg_title (6507663329723966854) -->
+    <skip />
     <string name="filter_apps_all">"Alles"</string>
     <string name="filter_apps_third_party">"Derden"</string>
     <string name="filter_apps_running">"Wordt uitgevoerd"</string>
@@ -627,22 +603,24 @@
     <string name="app_not_found_dlg_text">"De toepassing is niet gevonden in de lijst met geïnstalleerde toepassingen."</string>
     <string name="clear_data_failed">"Kan toepassingsgegevens niet wissen."</string>
     <string name="security_settings_desc">"Deze toepassing heeft toegang tot de volgende opties van uw telefoon:"</string>
-    <string name="computing_size">"Bezig met berekenen..."</string>
+    <!-- no translation found for computing_size (1599186977475211186) -->
+    <skip />
     <string name="invalid_size_value">"Kan grootte van pakket niet berekenen"</string>
     <string name="empty_list_msg">"U heeft geen toepassingen van derden geïnstalleerd."</string>
-    <string name="cache_header_label">"Cachegeheugen"</string>
-    <string name="clear_cache_btn_text">"Cache wissen"</string>
-    <string name="cache_size_label">"Cachegeheugen"</string>
     <string name="language_settings">"Landinstelling en tekst"</string>
     <string name="language_settings_summary">"Instellingen voor taal en regio, tekstinvoer en autocorrectieopties opgeven"</string>
     <string name="language_category">"Landinstelling"</string>
     <string name="text_category">"Tekstinstellingen"</string>
     <string name="phone_language">"Landinstelling selecteren"</string>
+    <!-- no translation found for phone_language_summary (1809580675831352352) -->
+    <skip />
     <string name="auto_replace">"Automatisch vervangen"</string>
     <string name="auto_replace_summary">"Corrigeer verkeerd getypte woorden"</string>
     <string name="auto_caps">"Automatische hoofdletters"</string>
     <string name="auto_caps_summary">"Eerste letters in zinnen met hoofdletter"</string>
     <string name="auto_punctuate">"Automatische interpunctie"</string>
+    <!-- no translation found for hardkeyboard_category (5957168411305769899) -->
+    <skip />
     <string name="auto_punctuate_summary">"Druk twee keer op de spatiebalk om \'.\' in te voegen"</string>
     <string name="show_password">"Zichtbare wachtwoorden"</string>
     <string name="show_password_summary">"Wachtwoord weergeven tijdens het typen"</string>
@@ -690,4 +668,68 @@
     <string name="keep_screen_on_summary">"Scherm gaat nooit uit tijdens het opladen"</string>
     <string name="allow_mock_location">"Neplocaties toestaan"</string>
     <string name="allow_mock_location_summary">"Neplocaties toestaan"</string>
+    <!-- no translation found for battery_history_known_apps (6907374478255786240) -->
+    <skip />
+    <!-- no translation found for gadget_picker_title (4335873961457985189) -->
+    <skip />
+    <!-- no translation found for battery_history_details_for (5189636461798594740) -->
+    <skip />
+    <!-- no translation found for battery_history_uid (1016606150528436298) -->
+    <skip />
+    <!-- no translation found for battery_history_network_usage (8010852371665217020) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_received (980307569180518302) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_sent (2501748768602119159) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_total (4444807574361642753) -->
+    <skip />
+    <!-- no translation found for battery_history_cpu_usage (2597353713014790877) -->
+    <skip />
+    <!-- no translation found for battery_history_user_time (6227507614894791359) -->
+    <skip />
+    <!-- no translation found for battery_history_system_time (2015862072724507547) -->
+    <skip />
+    <!-- no translation found for battery_history_total_time (3618703970098556104) -->
+    <skip />
+    <!-- no translation found for battery_history_starts (9137453931978571696) -->
+    <skip />
+    <!-- no translation found for battery_history_days (6387593985264923377) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (2593055276272350197) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (5608990219891318138) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (7397664460929461350) -->
+    <skip />
+    <!-- no translation found for battery_history_packages_sharing_this_uid (4101596071379250050) -->
+    <skip />
+    <!-- no translation found for battery_history_no_data (1177238743237067617) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor (2333488996028993982) -->
+    <skip />
+    <!-- no translation found for battery_history_used_by_packages (3000711380023436470) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage (3593133338613209024) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage_multi (4536084375991014508) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on (1377240025275657277) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_battery (536058210445081888) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_plugged (5019127390021871260) -->
+    <skip />
+    <!-- no translation found for usage_stats_label (5890846333487083609) -->
+    <skip />
+    <!-- no translation found for testing_usage_stats (7823048598893937339) -->
+    <skip />
+    <!-- no translation found for display_order_text (8592776965827565271) -->
+    <skip />
+    <!-- no translation found for app_name_label (2000949925256858308) -->
+    <skip />
+    <!-- no translation found for launch_count_label (4019444833263957024) -->
+    <skip />
+    <!-- no translation found for usage_time_label (295954901452833058) -->
+    <skip />
 </resources>
diff --git a/res/layout/list_setting_value_spinner.xml b/res/values-no-nokeys/strings.xml
index b603cf4..0e080b4 100644
--- a/res/layout/list_setting_value_spinner.xml
+++ b/res/values-no-nokeys/strings.xml
@@ -1,22 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<!--  Template for the generic static text in a setting's value -->
-<Spinner
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/setting_value_spinner"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content" />
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary">"Installerte applikasjoner, hurtigtaster"</string>
+</resources>
diff --git a/res/layout/wallpaper_picker.xml b/res/values-nokeys/strings.xml
index f95043f..67a69e7 100644
--- a/res/layout/wallpaper_picker.xml
+++ b/res/values-nokeys/strings.xml
@@ -14,14 +14,9 @@
      limitations under the License.
 -->
 
-<GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/grid"
-	android:layout_width="fill_parent" 
-	android:layout_height="fill_parent"
-    android:padding="10dip"
-    android:verticalSpacing="10dp"
-    android:horizontalSpacing="10dp"
-    android:numColumns="auto_fit"
-    android:columnWidth="60dp"
-    android:stretchMode="columnWidth"
-    android:gravity="top|center_horizontal"
-    android:fadingEdge="none"/>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Applications settings summary, on main settings screen. The summary for the "Applications" item on the main settings screen. Describes what settings are accessible from the "Applications" screen. This is the string to use for devices without a keyboard (so for example, there is no "Quick launch" settings here since that feature requires a keyboard) -->
+    <string name="applications_settings_summary">Manage applications</string>
+    
+</resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index eea35d9..2e49185 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -53,4 +53,15 @@
     <!-- no translation found for wifi_sleep_policy_entries:0 (3804733751095821976) -->
     <!-- no translation found for wifi_sleep_policy_entries:1 (1549288661423279207) -->
     <!-- no translation found for wifi_sleep_policy_entries:2 (1986753720941888596) -->
+    <!-- no translation found for battery_history_type_spinner:0 (2372160040893842611) -->
+    <!-- no translation found for battery_history_type_spinner:1 (7042951832385599110) -->
+    <!-- no translation found for battery_history_type_spinner:2 (7643330117743172161) -->
+    <!-- no translation found for battery_history_type_spinner:3 (7984071435080498080) -->
+    <!-- no translation found for battery_history_which_spinner:0 (8777827398176661463) -->
+    <!-- no translation found for battery_history_which_spinner:1 (2351620008414691945) -->
+    <!-- no translation found for battery_history_which_spinner:2 (1233325583071371898) -->
+    <!-- no translation found for battery_history_which_spinner:3 (524850874274605031) -->
+    <!-- no translation found for usage_stats_display_order_types:0 (9077371706468756228) -->
+    <!-- no translation found for usage_stats_display_order_types:1 (1908750532762193304) -->
+    <!-- no translation found for usage_stats_display_order_types:2 (1213951670006606353) -->
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 1723c92..4b461fa 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -16,9 +16,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="device_info_default">"Nieznany"</string>
-    <string name="device_info_uptime">"Czas działania"</string>
-    <string name="device_info_awaketime">"Czas działania w stanie wybudzenia"</string>
-    <string name="device_info_asleeptime">"Czas działania w stanie uśpienia"</string>
     <string name="turn_on_radio">"Włącz radio"</string>
     <string name="turn_off_radio">"Wyłącz radio"</string>
     <string name="turn_on_qxdm">"Włącz dziennik QXDM dla karty SD"</string>
@@ -52,14 +49,13 @@
     <string name="radioInfo_lac">"LAC"</string>
     <string name="radioInfo_cid">"CID"</string>
     <string name="sdcard_unmount">"Odłącz kartę SD"</string>
+    <!-- no translation found for sdcard_format (362497552060004057) -->
+    <skip />
     <string name="small_font">"Mały"</string>
     <string name="medium_font">"Średni"</string>
     <string name="large_font">"Duży"</string>
     <string name="font_size_save">"OK"</string>
     <string name="sdcard_setting">"Karta SD"</string>
-    <string name="screen_off_timeout_label">"Nigdy nie wygaszaj podczas ładowania"</string>
-    <string name="stay_on">"Ekran jest zawsze włączony podczas ładowania"</string>
-    <string name="app_launcher_newView_text">"Nowy AppLauncher"</string>
     <string name="battery_info_status_label">"Stan baterii:"</string>
     <string name="battery_info_scale_label">"Poziom baterii:"</string>
     <string name="battery_info_level_label">"Poziom naładowania baterii:"</string>
@@ -87,11 +83,6 @@
     <string name="battery_info_health_over_voltage">"Przepięcie"</string>
     <string name="battery_info_health_unspecified_failure">"Nieznany błąd"</string>
     <string name="bluetooth">"Bluetooth"</string>
-    <string name="bluetooth_stopping">"Zatrzymywanie Bluetooth..."</string>
-    <string name="bluetooth_disabled">"Włącz Bluetooth"</string>
-    <!-- no translation found for bluetooth_enabled (314506563815464155) -->
-    <skip />
-    <string name="bluetooth_enabling">"Włączanie Bluetooth..."</string>
     <string name="bluetooth_visibility">"Możliwe do wykrycia"</string>
     <string name="bluetooth_is_discoverable">"Możliwe do wykrycia przez <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekund..."</string>
     <string name="bluetooth_not_discoverable">"Zezwalaj na wykrywanie urządzenia"</string>
@@ -99,7 +90,6 @@
     <string name="bluetooth_device_name">"Nazwa urządzenia"</string>
     <string name="bluetooth_name_not_set">"Nie ustawiono nazwy, wykorzystywana jest nazwa konta"</string>
     <string name="bluetooth_scan_for_devices">"Wyszukaj urządzenia"</string>
-    <string name="bluetooth_clear_list">"Wyczyść listę urządzeń"</string>
     <string name="bluetooth_disconnect_blank">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie odłączone."</string>
     <string name="bluetooth_connected">"Połączony"</string>
     <string name="bluetooth_disconnected">"Rozłączona"</string>
@@ -108,17 +98,9 @@
     <!-- no translation found for bluetooth_unknown (644716244548801421) -->
     <skip />
     <string name="bluetooth_not_connected">"Paruj z tym urządzeniem"</string>
-    <string name="bluetooth_failed_to_enable">"Nie można włączyć Bluetooth"</string>
     <string name="bluetooth_pairing">"Parowanie..."</string>
-    <string name="failed_to_pair">"Nie można sparować z <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="failed_to_connect">"Nie można połączyć z <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_paired">"Sparowane"</string>
-    <string name="bluetooth_paired_not_nearby">"Sparowano"</string>
     <string name="bluetooth_device">"zestaw głośnomówiący/słuchawkowy"</string>
-    <string name="bluetooth_disconnect">"Rozłącz"</string>
-    <string name="bluetooth_connect">"Połącz"</string>
-    <string name="bluetooth_unpair">"Rozłącz parę"</string>
-    <string name="bluetooth_pair">"Paruj"</string>
     <string name="progress_scanning">"Przeszukiwanie"</string>
     <string name="bluetooth_notif_ticker">"Żądanie parowania Bluetooth"</string>
     <string name="bluetooth_notif_title">"Żądanie parowania"</string>
@@ -136,16 +118,6 @@
     <string name="intent_sender_startactivity_text">"Rozpocznij <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label">"Konto:"</string>
-    <string name="keyguard_pw_mod_text">"Wybierz wzór blokowania"</string>
-    <string name="keyguard_pin_mod_text">"Zmień kod PIN"</string>
-    <string name="keyguard_label">"Strażnik klawiszy"</string>
-    <string name="keyguard_sim_pin_label">"Kod PIN do karty SIM"</string>
-    <string name="keyguard_password_old_password_error_text">"Wprowadzone stare hasło jest nieprawidłowe. Spróbuj ponownie."</string>
-    <string name="keyguard_password_button_text">"OK"</string>
-    <string name="keyguard_password_confirm_new_label">"Potwierdź nowe hasło:"</string>
-    <string name="keyguard_password_new_label">"Nowe hasło:"</string>
-    <string name="keyguard_password_old_label">"Stare hasło:"</string>
-    <string name="keyguard_password_mismatch_error_text">"Hasła nie są identyczne. Należy wpisać je ponownie."</string>
     <string name="proxy_clear_text">"Wyczyść"</string>
     <string name="proxy_port_label">"Port"</string>
     <string name="proxy_defaultView_text">"Przywróć ustawienia domyślne"</string>
@@ -188,15 +160,13 @@
     <string name="radio_info_smsc_label">"SMSC:"</string>
     <string name="radio_info_smsc_update_label">"Aktualizuj"</string>
     <string name="radio_info_smsc_refresh_label">"Odśwież"</string>
+    <!-- no translation found for radio_info_toggle_dns_check_label (8292252930563286858) -->
+    <skip />
     <string name="band_mode_title">"Ustaw pasmo GSM/UMTS"</string>
     <string name="band_mode_loading">"Ładowanie listy pasm..."</string>
     <string name="band_mode_set">"Ustaw"</string>
     <string name="band_mode_failed">"Niepowodzenie"</string>
     <string name="band_mode_succeeded">"Powodzenie"</string>
-    <string name="ringer_volume_ringer_mode_label">"Tryb dzwonka"</string>
-    <string name="ringer_volume_screen_increasing_text">"Dzwonek narastający"</string>
-    <string name="ringer_volume_ringtone_label">"Dzwonek"</string>
-    <string name="ringer_volume_instructions">"Użyj przycisków głośności, aby dostosować głośność dzwonka"</string>
     <string name="sdcard_changes_instructions">"Zmiany zostaną wprowadzone po ponownym podłączeniu przewodu USB"</string>
     <string name="sdcard_settings_screen_mass_storage_text">"Włącz pamięć masową USB"</string>
     <string name="sdcard_settings_total_bytes_label">"Łącznie bajtów:"</string>
@@ -208,20 +178,6 @@
     <string name="sdcard_settings_used_bytes_label">"Wykorzystanych bajtów:"</string>
     <string name="sdcard_settings_scanning_status">"Przeszukiwanie karty SD w poszukiwaniu multimediów..."</string>
     <string name="sdcard_settings_read_only_status">"Karta SD jest zamontowana tylko do odczytu"</string>
-    <string name="sdcard_removal_alert_title">"Niebezpieczne usuwanie karty SD!"</string>
-    <string name="sdcard_unmountable_alert_title">"Karta SD nie nadaje się do odczytu"</string>
-    <string name="telephony_user_label">"Użytkownik:"</string>
-    <string name="telephony_server_label">"Serwer:"</string>
-    <string name="telephony_name_label">"Nazwa:"</string>
-    <string name="telephony_mmsc_label">"MMSC:"</string>
-    <string name="telephony_apn_label">"APN:"</string>
-    <string name="telephony_mcc_label">"MCC:"</string>
-    <string name="telephony_port_label">"Port:"</string>
-    <string name="telephony_password_label">"Hasło:"</string>
-    <string name="telephony_proxy_label">"Proxy:"</string>
-    <string name="telephony_mnc_label">"MNC:"</string>
-    <string name="telephony_mmsproxy_label">"Proxy dla MMS:"</string>
-    <string name="telephony_mmsport_label">"Port MMS:"</string>
     <string name="next_label">"Dalej"</string>
     <string name="language_picker_title">"Ustawienia regionalne"</string>
     <string name="select_your_language">"Wybierz język"</string>
@@ -264,23 +220,12 @@
     <string name="bluetooth_settings_summary">"Zarządzaj połączeniami, ustaw nazwę urządzenia i możliwość wykrycia"</string>
     <string name="bluetooth_pin_entry">"Żądanie parowania Bluetooth"</string>
     <string name="bluetooth_device_info">"Informacje o urządzeniu Bluetooth"</string>
-    <string name="bluetooth_pairing_msg">"Parowanie..."</string>
     <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Wpisz kod PIN, aby sparować."\n"(Spróbuj użyć kodu 0000 lub 1234.)"</string>
     <string name="bluetooth_error_title">"Uwaga"</string>
     <string name="bluetooth_pairing_error_message">"Wystąpił problem podczas parowania z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <string name="bluetooth_pairing_alternate_error_message">"Wystąpił problem podczas parowania z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Spróbuj użyć innego kodu PIN."</string>
     <string name="bluetooth_pairing_pin_error_message">"Wystąpił problem podczas parowania z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Wpisany kod PIN jest nieprawidłowy."</string>
     <string name="bluetooth_connecting_error_message">"Wystąpił problem podczas łączenia z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <string name="bluetooth_new_data">"Wprowadź nowe dane"</string>
-    <string name="bluetooth_new_data_confirm">"OK"</string>
-    <string name="bluetooth_new_data_cancel">"Anuluj"</string>
-    <string name="bluetooth_scan_for_new_devices">"Wyszukiwanie nowych urządzeń..."</string>
-    <string name="bluetooth_discoverability_panel_title">"Chcę być..."</string>
-    <string name="bluetooth_discoverable">"Możliwe do wykrycia przez <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> sekund"</string>
-    <string name="bluetooth_connectable">"Tylko możliwe do podłączenia"</string>
-    <string name="bluetooth_neither">"Niemożliwe do wykrycia ani do podłączenia"</string>
     <string name="bluetooth_preference_scan_title">"Wyszukaj urządzenia"</string>
-    <string name="bluetooth_preference_scan_summary">"Znajdź urządzenia do sparowania"</string>
     <string name="bluetooth_device_context_connect">"Połącz"</string>
     <string name="bluetooth_device_context_disconnect">"Rozłącz"</string>
     <string name="bluetooth_device_context_pair_connect">"Sparuj i połącz"</string>
@@ -420,32 +365,24 @@
     <string name="sound_effects_enable_title">"Dźwięk wybierania"</string>
     <string name="sound_effects_enable_summary_on">"Odtwarzaj dźwięk podczas wyboru ekranu"</string>
     <string name="sound_effects_enable_summary_off">"Odtwarzaj dźwięk podczas wyboru ekranu"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_title (1008791464029179529) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (426729807044947187) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (803791141563778934) -->
+    <skip />
     <string name="sync_settings">"Synchronizacja danych"</string>
     <string name="sync_settings_summary">"Wybierz, które aplikacje są synchronizowane"</string>
-    <string name="sync_settings_header_general_settings">"Ogólne ustawienia synchronizacji"</string>
-    <string name="sync_settings_header_application_settings">"Ustawienia synchronizacji aplikacji"</string>
-    <string name="sync_too_many_deletes">"Limit usuwania został przekroczony"</string>
-    <string name="sync_automatically">"Automatyczna synchronizacja"</string>
-    <string name="sync_enabled">"Synchronizuj dane automatycznie"</string>
-    <string name="sync_disabled">"Zaznacz, aby automatycznie synchronizować dane"</string>
-    <string name="sync_menu_sync_now">"Synchronizuj teraz"</string>
-    <string name="sync_menu_sync_cancel">"Anuluj synchronizację"</string>
-    <string name="sync_gmail">"Gmail"</string>
-    <string name="sync_calendar">"Kalendarz"</string>
-    <string name="sync_contacts">"Kontakty"</string>
-    <string name="sync_too_many_deletes_desc">"Na koncie <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g> jest <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> usuniętych elementów typu <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>. Co chcesz zrobić?"</string>
-    <string name="sync_really_delete">"Usuń elementy."</string>
-    <string name="sync_undo_deletes">"Cofnij usuwanie."</string>
-    <string name="sync_do_nothing">"Nic na razie nie rób."</string>
-    <string name="sync_is_failing">"W tej chwili występują problemy z synchronizacją. Synchronizacja będzie możliwa wkrótce."</string>
-    <string name="sync_plug"><font fgcolor="#ffffffff">"Witamy w usłudze Google Sync!"</font>" "\n"Rozwiązanie firmy Google do synchronizowania danych umożliwia dostęp do kontaktów, umówionych spotkań itd. z dowolnego miejsca na świecie."</string>
     <string name="display_settings">"Ustawienia wyświetlacza"</string>
     <string name="animations_title">"Animacja"</string>
     <string name="animations_summary_on">"Pokazuj animację podczas otwierania/zamykania okien"</string>
     <string name="animations_summary_off">"Pokazuj animację podczas otwierania/zamykania okien"</string>
     <string name="brightness">"Jasność"</string>
+    <!-- no translation found for brightness_summary (838917350127550703) -->
+    <skip />
     <string name="screen_timeout">"Wygaszenie ekranu"</string>
-    <string name="dim_screen">"Ściemnij ekran"</string>
+    <!-- no translation found for screen_timeout_summary (2905757633140605334) -->
+    <skip />
     <string name="sim_lock_settings">"Ustawienia blokady karty SIM"</string>
     <string name="sim_lock_settings_category">"Skonfiguruj blokadę karty SIM"</string>
     <string name="sim_lock_settings_title">"Blokada karty SIM"</string>
@@ -493,13 +430,24 @@
     <string name="status_wifi_mac_address">"Adres MAC karty Wi-Fi"</string>
     <string name="status_bt_address">"Adres Bluetooth"</string>
     <string name="status_unavailable">"Niedostępny"</string>
+    <!-- no translation found for status_network_traffic_stats (2089739529980224804) -->
+    <skip />
+    <!-- no translation found for status_network_traffic_summary (1456797220417923108) -->
+    <skip />
     <string name="status_up_time">"Czas działania"</string>
     <string name="status_awake_time">"Czas działania w stanie wybudzenia"</string>
     <string name="internal_memory">"Pamięć wewnętrzna telefonu"</string>
     <string name="sd_memory">"Karta SD"</string>
     <string name="memory_available">"Dostępne miejsce"</string>
     <string name="memory_size">"Łączny rozmiar"</string>
-    <string name="sd_eject">"Odłącz/wysuń kartę SD"</string>
+    <!-- no translation found for sd_eject (6915293408836853020) -->
+    <skip />
+    <!-- no translation found for sd_eject_summary (3315557796211542962) -->
+    <skip />
+    <!-- no translation found for sd_format (5448738337382712203) -->
+    <skip />
+    <!-- no translation found for sd_format_summary (6616491027883134004) -->
+    <skip />
     <string name="sd_unavailable">"Niedostępna"</string>
     <string name="read_only">"(Tylko do odczytu)"</string>
     <string name="battery_status_title">"Stan baterii"</string>
@@ -538,6 +486,22 @@
     <string name="master_clear_gesture_prompt">"Narysuj wzór odblokowania"</string>
     <string name="master_clear_gesture_explanation">"Aby potwierdzić resetowanie telefonu, musisz narysować swój wzór odblokowania."</string>
     <string name="master_clear_failed">"Nie wykonano resetowania, ponieważ usługa czyszczenia systemu nie jest dostępna."</string>
+    <!-- no translation found for media_format_title (4671276096695789895) -->
+    <skip />
+    <!-- no translation found for media_format_summary (3805714639375830120) -->
+    <skip />
+    <!-- no translation found for media_format_desc (1142563222357820834) -->
+    <skip />
+    <!-- no translation found for media_format_button_text (370856400090190151) -->
+    <skip />
+    <!-- no translation found for media_format_final_desc (1776666694910717198) -->
+    <skip />
+    <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_prompt (3109349468816856670) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_explanation (4239529439389660159) -->
+    <skip />
     <string name="call_settings_title">"Ustawienia połączeń"</string>
     <string name="call_settings_summary">"Konfiguracja poczty głosowej, przekierowania połączeń, połączeń oczekujących, identyfikatora dzwoniącego"</string>
     <string name="network_settings_title">"Sieci komórkowe"</string>
@@ -591,17 +555,25 @@
     <string name="lock_example_title">"Przykładowy wzór"</string>
     <string name="lock_example_message">"Połącz co najmniej cztery kropki."\n" "\n"Wybierz polecenie „Dalej”, kiedy zechcesz narysować własny wzór."</string>
     <string name="manageapplications_settings_title">"Zarządzaj aplikacjami"</string>
+    <!-- no translation found for manageapplications_settings_summary (6097117021500651232) -->
+    <skip />
     <string name="applications_settings">"Aplikacje"</string>
     <string name="applications_settings_summary">"Zarządzaj aplikacjami, skonfiguruj skróty szybkiego uruchamiania"</string>
     <string name="applications_settings_header">"Ustawienia aplikacji"</string>
     <string name="install_applications">"Nieznane źródła"</string>
     <string name="install_unknown_applications">"Pozwól na instalowanie aplikacji ze źródeł pozarynkowych"</string>
     <string name="install_all_warning">"Telefon i dane osobiste są bardziej narażone na atak za pomocą aplikacji z nieznanych źródeł. Zgadzasz się ponieść pełną odpowiedzialność za wszelkie uszkodzenia telefonu oraz utratę danych, które mogą wyniknąć ze stosowania tych aplikacji."</string>
-    <string name="manage_applications_title">"Zarządzaj aplikacjami"</string>
     <string name="application_info_label">"Informacje o aplikacji"</string>
     <string name="storage_label">"Pamięć"</string>
     <string name="auto_launch_label">"Uruchom domyślnie"</string>
     <string name="permissions_label">"Uprawnienia"</string>
+    <string name="cache_header_label">"Pamięć podręczna"</string>
+    <string name="clear_cache_btn_text">"Wyczyść pamięć podręczną"</string>
+    <string name="cache_size_label">"Pamięć podręczna"</string>
+    <!-- no translation found for controls_label (7611113077086853799) -->
+    <skip />
+    <!-- no translation found for force_stop (7435006169872876756) -->
+    <skip />
     <string name="total_size_label">"Razem"</string>
     <string name="application_size_label">"Aplikacja"</string>
     <string name="data_size_label">"Dane"</string>
@@ -614,6 +586,10 @@
     <string name="sort_order_alpha">"Sortuj"</string>
     <string name="sort_order_size">"Sortuj według rozmiaru"</string>
     <string name="manage_space_text">"Zarządzaj rozmiarem"</string>
+    <!-- no translation found for filter (2018011724373033887) -->
+    <skip />
+    <!-- no translation found for filter_dlg_title (6507663329723966854) -->
+    <skip />
     <string name="filter_apps_all">"Wszystkie"</string>
     <string name="filter_apps_third_party">"Inne firmy"</string>
     <string name="filter_apps_running">"Uruchomione"</string>
@@ -627,22 +603,24 @@
     <string name="app_not_found_dlg_text">"Program nie został znaleziony na liście zainstalowanych aplikacji."</string>
     <string name="clear_data_failed">"Nie można wyczyścić danych aplikacji."</string>
     <string name="security_settings_desc">"Ta aplikacja ma dostęp do następujących funkcji telefonu:"</string>
-    <string name="computing_size">"Trwa obliczanie…"</string>
+    <!-- no translation found for computing_size (1599186977475211186) -->
+    <skip />
     <string name="invalid_size_value">"Nie można obliczyć rozmiaru pakietu"</string>
     <string name="empty_list_msg">"Nie zainstalowano żadnych aplikacji innych firm."</string>
-    <string name="cache_header_label">"Pamięć podręczna"</string>
-    <string name="clear_cache_btn_text">"Wyczyść pamięć podręczną"</string>
-    <string name="cache_size_label">"Pamięć podręczna"</string>
     <string name="language_settings">"Ustawienia regionalne i ustawienia tekstu"</string>
     <string name="language_settings_summary">"Określ ustawienia regionalne (język i region) oraz opcje wprowadzania tekstu i autokorekty"</string>
     <string name="language_category">"Ustawienia regionalne"</string>
     <string name="text_category">"Ustawienia tekstu"</string>
     <string name="phone_language">"Wybierz ustawienia regionalne"</string>
+    <!-- no translation found for phone_language_summary (1809580675831352352) -->
+    <skip />
     <string name="auto_replace">"Automatyczne zastępowanie"</string>
     <string name="auto_replace_summary">"Poprawiaj błędnie wpisane słowa"</string>
     <string name="auto_caps">"Automatyczne wielkie litery"</string>
     <string name="auto_caps_summary">"Zdanie zaczynaj wielką literą"</string>
     <string name="auto_punctuate">"Automatyczna interpunkcja"</string>
+    <!-- no translation found for hardkeyboard_category (5957168411305769899) -->
+    <skip />
     <string name="auto_punctuate_summary">"Naciśnij klawisz spacji dwukrotnie, aby wstawić „.”"</string>
     <string name="show_password">"Widoczne hasła"</string>
     <string name="show_password_summary">"Pokazuj hasło podczas wpisywania"</string>
@@ -690,4 +668,68 @@
     <string name="keep_screen_on_summary">"Ekran nigdy nie będzie gaszony podczas ładowania"</string>
     <string name="allow_mock_location">"Zezwalaj na pozorowane położenia"</string>
     <string name="allow_mock_location_summary">"Zezwalaj na pozorowane położenia"</string>
+    <!-- no translation found for battery_history_known_apps (6907374478255786240) -->
+    <skip />
+    <!-- no translation found for gadget_picker_title (4335873961457985189) -->
+    <skip />
+    <!-- no translation found for battery_history_details_for (5189636461798594740) -->
+    <skip />
+    <!-- no translation found for battery_history_uid (1016606150528436298) -->
+    <skip />
+    <!-- no translation found for battery_history_network_usage (8010852371665217020) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_received (980307569180518302) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_sent (2501748768602119159) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_total (4444807574361642753) -->
+    <skip />
+    <!-- no translation found for battery_history_cpu_usage (2597353713014790877) -->
+    <skip />
+    <!-- no translation found for battery_history_user_time (6227507614894791359) -->
+    <skip />
+    <!-- no translation found for battery_history_system_time (2015862072724507547) -->
+    <skip />
+    <!-- no translation found for battery_history_total_time (3618703970098556104) -->
+    <skip />
+    <!-- no translation found for battery_history_starts (9137453931978571696) -->
+    <skip />
+    <!-- no translation found for battery_history_days (6387593985264923377) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (2593055276272350197) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (5608990219891318138) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (7397664460929461350) -->
+    <skip />
+    <!-- no translation found for battery_history_packages_sharing_this_uid (4101596071379250050) -->
+    <skip />
+    <!-- no translation found for battery_history_no_data (1177238743237067617) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor (2333488996028993982) -->
+    <skip />
+    <!-- no translation found for battery_history_used_by_packages (3000711380023436470) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage (3593133338613209024) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage_multi (4536084375991014508) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on (1377240025275657277) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_battery (536058210445081888) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_plugged (5019127390021871260) -->
+    <skip />
+    <!-- no translation found for usage_stats_label (5890846333487083609) -->
+    <skip />
+    <!-- no translation found for testing_usage_stats (7823048598893937339) -->
+    <skip />
+    <!-- no translation found for display_order_text (8592776965827565271) -->
+    <skip />
+    <!-- no translation found for app_name_label (2000949925256858308) -->
+    <skip />
+    <!-- no translation found for launch_count_label (4019444833263957024) -->
+    <skip />
+    <!-- no translation found for usage_time_label (295954901452833058) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 304802e..cc00212 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -53,4 +53,15 @@
     <!-- no translation found for wifi_sleep_policy_entries:0 (3804733751095821976) -->
     <!-- no translation found for wifi_sleep_policy_entries:1 (1549288661423279207) -->
     <!-- no translation found for wifi_sleep_policy_entries:2 (1986753720941888596) -->
+    <!-- no translation found for battery_history_type_spinner:0 (2372160040893842611) -->
+    <!-- no translation found for battery_history_type_spinner:1 (7042951832385599110) -->
+    <!-- no translation found for battery_history_type_spinner:2 (7643330117743172161) -->
+    <!-- no translation found for battery_history_type_spinner:3 (7984071435080498080) -->
+    <!-- no translation found for battery_history_which_spinner:0 (8777827398176661463) -->
+    <!-- no translation found for battery_history_which_spinner:1 (2351620008414691945) -->
+    <!-- no translation found for battery_history_which_spinner:2 (1233325583071371898) -->
+    <!-- no translation found for battery_history_which_spinner:3 (524850874274605031) -->
+    <!-- no translation found for usage_stats_display_order_types:0 (9077371706468756228) -->
+    <!-- no translation found for usage_stats_display_order_types:1 (1908750532762193304) -->
+    <!-- no translation found for usage_stats_display_order_types:2 (1213951670006606353) -->
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 011519a..5fa0d29 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -16,9 +16,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="device_info_default">"Неизвестно"</string>
-    <string name="device_info_uptime">"Время работы"</string>
-    <string name="device_info_awaketime">"Время активности"</string>
-    <string name="device_info_asleeptime">"Время простоя"</string>
     <string name="turn_on_radio">"Включить радиосвязь"</string>
     <string name="turn_off_radio">"Отключить радиосвязь"</string>
     <string name="turn_on_qxdm">"Включить журнал QXDM SD"</string>
@@ -52,14 +49,13 @@
     <string name="radioInfo_lac">"LAC"</string>
     <string name="radioInfo_cid">"CID"</string>
     <string name="sdcard_unmount">"Отключиться от карты SD"</string>
+    <!-- no translation found for sdcard_format (362497552060004057) -->
+    <skip />
     <string name="small_font">"Мелкий"</string>
     <string name="medium_font">"Средний"</string>
     <string name="large_font">"Крупный"</string>
     <string name="font_size_save">"ОК"</string>
     <string name="sdcard_setting">"Карта SD"</string>
-    <string name="screen_off_timeout_label">"Не отключать экран при зарядке"</string>
-    <string name="stay_on">"При зарядке экран всегда включен"</string>
-    <string name="app_launcher_newView_text">"Новый AppLauncher"</string>
     <string name="battery_info_status_label">"Состояние батареи:"</string>
     <string name="battery_info_scale_label">"Шкала батареи:"</string>
     <string name="battery_info_level_label">"Уровень заряда батареи:"</string>
@@ -87,11 +83,6 @@
     <string name="battery_info_health_over_voltage">"Скачок напряжения"</string>
     <string name="battery_info_health_unspecified_failure">"Неизвестная ошибка"</string>
     <string name="bluetooth">"Bluetooth"</string>
-    <string name="bluetooth_stopping">"Остановка Bluetooth..."</string>
-    <string name="bluetooth_disabled">"Включить Bluetooth"</string>
-    <!-- no translation found for bluetooth_enabled (314506563815464155) -->
-    <skip />
-    <string name="bluetooth_enabling">"Включение Bluetooth…"</string>
     <string name="bluetooth_visibility">"Видно другим"</string>
     <string name="bluetooth_is_discoverable">"Виден в течение <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> сек…"</string>
     <string name="bluetooth_not_discoverable">"Сделать устройство видимым"</string>
@@ -99,7 +90,6 @@
     <string name="bluetooth_device_name">"Название устройства"</string>
     <string name="bluetooth_name_not_set">"Имя не задано, используется имя аккаунта"</string>
     <string name="bluetooth_scan_for_devices">"Поиск устройств"</string>
-    <string name="bluetooth_clear_list">"Очистить список устройств"</string>
     <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет отключено."</string>
     <string name="bluetooth_connected">"Подключено"</string>
     <string name="bluetooth_disconnected">"Отключено"</string>
@@ -108,17 +98,9 @@
     <!-- no translation found for bluetooth_unknown (644716244548801421) -->
     <skip />
     <string name="bluetooth_not_connected">"Создать пару с этим устройством"</string>
-    <string name="bluetooth_failed_to_enable">"Не удается включить Bluetooth"</string>
     <string name="bluetooth_pairing">"Идет создание пары..."</string>
-    <string name="failed_to_pair">"Не удается соединиться с <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="failed_to_connect">"Не удается подключиться к <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_paired">"Соединено"</string>
-    <string name="bluetooth_paired_not_nearby">"Соединено"</string>
     <string name="bluetooth_device">"гарнитура/наушники"</string>
-    <string name="bluetooth_disconnect">"Отключить"</string>
-    <string name="bluetooth_connect">"Подключиться"</string>
-    <string name="bluetooth_unpair">"Отсоединить"</string>
-    <string name="bluetooth_pair">"Создать пару"</string>
     <string name="progress_scanning">"Сканирование"</string>
     <string name="bluetooth_notif_ticker">"Запрос на соединение Bluetooth"</string>
     <string name="bluetooth_notif_title">"Запрос на соединение"</string>
@@ -136,16 +118,6 @@
     <string name="intent_sender_startactivity_text">"Запустить <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label">"Аккаунт:"</string>
-    <string name="keyguard_pw_mod_text">"Выбор комбинации блокировки"</string>
-    <string name="keyguard_pin_mod_text">"Изменить PIN"</string>
-    <string name="keyguard_label">"Keyguard"</string>
-    <string name="keyguard_sim_pin_label">"PIN SIM-карты"</string>
-    <string name="keyguard_password_old_password_error_text">"Указан неверный старый пароль. Попробуйте еще раз."</string>
-    <string name="keyguard_password_button_text">"ОК"</string>
-    <string name="keyguard_password_confirm_new_label">"Подтвердите новый пароль:"</string>
-    <string name="keyguard_password_new_label">"Новый пароль:"</string>
-    <string name="keyguard_password_old_label">"Старый пароль:"</string>
-    <string name="keyguard_password_mismatch_error_text">"Пароли не совпадают. Введите их еще раз."</string>
     <string name="proxy_clear_text">"Очистить"</string>
     <string name="proxy_port_label">"Порт"</string>
     <string name="proxy_defaultView_text">"Восстановить значения по умолчанию"</string>
@@ -188,15 +160,13 @@
     <string name="radio_info_smsc_label">"SMSC:"</string>
     <string name="radio_info_smsc_update_label">"Обновить"</string>
     <string name="radio_info_smsc_refresh_label">"Обновить"</string>
+    <!-- no translation found for radio_info_toggle_dns_check_label (8292252930563286858) -->
+    <skip />
     <string name="band_mode_title">"Установить диапазон GSM/UMTS"</string>
     <string name="band_mode_loading">"Загрузка списка диапазонов…"</string>
     <string name="band_mode_set">"Установить"</string>
     <string name="band_mode_failed">"Ошибка"</string>
     <string name="band_mode_succeeded">"Успешно"</string>
-    <string name="ringer_volume_ringer_mode_label">"Режим звонка"</string>
-    <string name="ringer_volume_screen_increasing_text">"Нарастающий звонок"</string>
-    <string name="ringer_volume_ringtone_label">"Мелодия звонка"</string>
-    <string name="ringer_volume_instructions">"Отрегулируйте громкость звонка с помощью кнопок громкости"</string>
     <string name="sdcard_changes_instructions">"Изменения вступят в силу после повторного подключения кабеля USB"</string>
     <string name="sdcard_settings_screen_mass_storage_text">"Включить устройство хранения USB"</string>
     <string name="sdcard_settings_total_bytes_label">"Всего байт:"</string>
@@ -208,20 +178,6 @@
     <string name="sdcard_settings_used_bytes_label">"Занято, байт:"</string>
     <string name="sdcard_settings_scanning_status">"Поиск мультимедиа на карте SD…"</string>
     <string name="sdcard_settings_read_only_status">"Подключение к карте SD только для чтения"</string>
-    <string name="sdcard_removal_alert_title">"Небезопасное удаление карты SD!"</string>
-    <string name="sdcard_unmountable_alert_title">"Карта SD не читается"</string>
-    <string name="telephony_user_label">"Пользователь:"</string>
-    <string name="telephony_server_label">"Сервер:"</string>
-    <string name="telephony_name_label">"Название:"</string>
-    <string name="telephony_mmsc_label">"MMSC:"</string>
-    <string name="telephony_apn_label">"APN:"</string>
-    <string name="telephony_mcc_label">"MCC:"</string>
-    <string name="telephony_port_label">"Порт:"</string>
-    <string name="telephony_password_label">"Пароль:"</string>
-    <string name="telephony_proxy_label">"Прокси:"</string>
-    <string name="telephony_mnc_label">"MNC:"</string>
-    <string name="telephony_mmsproxy_label">"Прокси MMS:"</string>
-    <string name="telephony_mmsport_label">"Порт MMS:"</string>
     <string name="next_label">"Далее"</string>
     <string name="language_picker_title">"Локаль"</string>
     <string name="select_your_language">"Выберите язык"</string>
@@ -264,23 +220,12 @@
     <string name="bluetooth_settings_summary">"Управление подключениями, установка названия и видимости устройства"</string>
     <string name="bluetooth_pin_entry">"Запрос на соединение Bluetooth"</string>
     <string name="bluetooth_device_info">"Сведения об устройстве Bluetooth"</string>
-    <string name="bluetooth_pairing_msg">"Идет создание пары..."</string>
     <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"Для создания пары укажите PIN."\n"(Попробуйте 0000 или 1234.)"</string>
     <string name="bluetooth_error_title">"Внимание"</string>
     <string name="bluetooth_pairing_error_message">"Не удалось создать пару с устройством <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_alternate_error_message">"Не удалось создать пару с устройством <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Попробуйте другой PIN."</string>
     <string name="bluetooth_pairing_pin_error_message">"Не удалось создать пару с устройством <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, поскольку указан неверный PIN."</string>
     <string name="bluetooth_connecting_error_message">"Не удалось подключиться к устройству <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_new_data">"Ввести новые данные"</string>
-    <string name="bluetooth_new_data_confirm">"ОК"</string>
-    <string name="bluetooth_new_data_cancel">"Отмена"</string>
-    <string name="bluetooth_scan_for_new_devices">"Идет поиск новых устройств…"</string>
-    <string name="bluetooth_discoverability_panel_title">"Сделать…"</string>
-    <string name="bluetooth_discoverable">"Виден в течение <xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> сек."</string>
-    <string name="bluetooth_connectable">"Только при возможности подключения"</string>
-    <string name="bluetooth_neither">"Не является обнаруживаемым или доступным для подключения"</string>
     <string name="bluetooth_preference_scan_title">"Поиск устройств"</string>
-    <string name="bluetooth_preference_scan_summary">"Найти устройства для создания пары"</string>
     <string name="bluetooth_device_context_connect">"Подключиться"</string>
     <string name="bluetooth_device_context_disconnect">"Отключить"</string>
     <string name="bluetooth_device_context_pair_connect">"Создать пару и подключиться"</string>
@@ -420,32 +365,24 @@
     <string name="sound_effects_enable_title">"Звук при выборе"</string>
     <string name="sound_effects_enable_summary_on">"Воспроизвести звук при выборе на экране"</string>
     <string name="sound_effects_enable_summary_off">"Воспроизвести звук при выборе на экране"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_title (1008791464029179529) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (426729807044947187) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (803791141563778934) -->
+    <skip />
     <string name="sync_settings">"Синхронизация данных"</string>
     <string name="sync_settings_summary">"Выбрать синхронизируемые приложения"</string>
-    <string name="sync_settings_header_general_settings">"Общие настройки синхронизации"</string>
-    <string name="sync_settings_header_application_settings">"Настройки синхронизации приложений"</string>
-    <string name="sync_too_many_deletes">"Превышен предел удаления"</string>
-    <string name="sync_automatically">"Синхронизировать автоматически"</string>
-    <string name="sync_enabled">"Синхронизировать данные автоматически"</string>
-    <string name="sync_disabled">"Выберите для автоматической синхронизации данных"</string>
-    <string name="sync_menu_sync_now">"Синхронизировать"</string>
-    <string name="sync_menu_sync_cancel">"Отменить синхронизацию"</string>
-    <string name="sync_gmail">"Gmail"</string>
-    <string name="sync_calendar">"Календарь"</string>
-    <string name="sync_contacts">"Контакты"</string>
-    <string name="sync_too_many_deletes_desc">"Для <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g> имеется <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> удаленных объектов (аккаунт <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>). Что нужно сделать?"</string>
-    <string name="sync_really_delete">"Удалить элементы."</string>
-    <string name="sync_undo_deletes">"Отменить удаления."</string>
-    <string name="sync_do_nothing">"Ничего не делать сейчас."</string>
-    <string name="sync_is_failing">"Проблемы с синхронизацией. Скоро все снова будет работать."</string>
-    <string name="sync_plug"><font fgcolor="#ffffffff">"Добро пожаловать в Google Sync!"</font>" "\n"Решение Google для синхронизации данных, которое обеспечивает доступ к данным о контактах, встречах и многом другом, где бы вы ни были."</string>
     <string name="display_settings">"Настройки экрана"</string>
     <string name="animations_title">"Анимация"</string>
     <string name="animations_summary_on">"Показывать анимацию при открытии и закрытии окон"</string>
     <string name="animations_summary_off">"Показывать анимацию при открытии и закрытии окон"</string>
     <string name="brightness">"Яркость"</string>
+    <!-- no translation found for brightness_summary (838917350127550703) -->
+    <skip />
     <string name="screen_timeout">"Время до отключения экрана"</string>
-    <string name="dim_screen">"Затемнение экрана"</string>
+    <!-- no translation found for screen_timeout_summary (2905757633140605334) -->
+    <skip />
     <string name="sim_lock_settings">"Настройки блокировки SIM-карты"</string>
     <string name="sim_lock_settings_category">"Установить блокировку SIM-карты"</string>
     <string name="sim_lock_settings_title">"Блокировка SIM-карты"</string>
@@ -493,13 +430,24 @@
     <string name="status_wifi_mac_address">"MAC-адрес Wi-Fi"</string>
     <string name="status_bt_address">"Адрес Bluetooth"</string>
     <string name="status_unavailable">"Недоступно"</string>
+    <!-- no translation found for status_network_traffic_stats (2089739529980224804) -->
+    <skip />
+    <!-- no translation found for status_network_traffic_summary (1456797220417923108) -->
+    <skip />
     <string name="status_up_time">"Время работы"</string>
     <string name="status_awake_time">"Время активности"</string>
     <string name="internal_memory">"Хранение в памяти телефона"</string>
     <string name="sd_memory">"Карта SD"</string>
     <string name="memory_available">"Доступное место"</string>
     <string name="memory_size">"Всего места"</string>
-    <string name="sd_eject">"Отключить/извлечь карту SD"</string>
+    <!-- no translation found for sd_eject (6915293408836853020) -->
+    <skip />
+    <!-- no translation found for sd_eject_summary (3315557796211542962) -->
+    <skip />
+    <!-- no translation found for sd_format (5448738337382712203) -->
+    <skip />
+    <!-- no translation found for sd_format_summary (6616491027883134004) -->
+    <skip />
     <string name="sd_unavailable">"Недоступно"</string>
     <string name="read_only">"(Только для чтения)"</string>
     <string name="battery_status_title">"Состояние батареи"</string>
@@ -538,6 +486,22 @@
     <string name="master_clear_gesture_prompt">"Воспроизведите комбинацию разблокировки"</string>
     <string name="master_clear_gesture_explanation">"Для подтверждения сброса телефона нужно воспроизвести комбинацию разблокировки."</string>
     <string name="master_clear_failed">"Сброс не произведен, так как служба очистки системы недоступна."</string>
+    <!-- no translation found for media_format_title (4671276096695789895) -->
+    <skip />
+    <!-- no translation found for media_format_summary (3805714639375830120) -->
+    <skip />
+    <!-- no translation found for media_format_desc (1142563222357820834) -->
+    <skip />
+    <!-- no translation found for media_format_button_text (370856400090190151) -->
+    <skip />
+    <!-- no translation found for media_format_final_desc (1776666694910717198) -->
+    <skip />
+    <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_prompt (3109349468816856670) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_explanation (4239529439389660159) -->
+    <skip />
     <string name="call_settings_title">"Настройки вызовов"</string>
     <string name="call_settings_summary">"Настройка голосовой почты, перенаправления звонков, удержания звонков, идентификатора звонящего"</string>
     <string name="network_settings_title">"Мобильные сети"</string>
@@ -591,17 +555,25 @@
     <string name="lock_example_title">"Пример комбинации"</string>
     <string name="lock_example_message">"Соедините не меньше четырех точек."\n" "\n"Выберите \"Далее\", когда будете готовы создать свою комбинацию."</string>
     <string name="manageapplications_settings_title">"Управление приложениями"</string>
+    <!-- no translation found for manageapplications_settings_summary (6097117021500651232) -->
+    <skip />
     <string name="applications_settings">"Приложения"</string>
     <string name="applications_settings_summary">"Управление приложениями, настройка горячих клавиш"</string>
     <string name="applications_settings_header">"Настройки приложений"</string>
     <string name="install_applications">"Неизвестные источники"</string>
     <string name="install_unknown_applications">"Разрешить установку приложений не из Android Маркет"</string>
     <string name="install_all_warning">"Атака приложений из неизвестных источников более опасна для телефона и личных данных. Вы соглашаетесь, что несете всю ответственность за ущерб телефону или потерю данных, которые могут произойти от использования таких приложений."</string>
-    <string name="manage_applications_title">"Управление приложениями"</string>
     <string name="application_info_label">"Сведения о приложении"</string>
     <string name="storage_label">"Хранение"</string>
     <string name="auto_launch_label">"Запускать по умолчанию"</string>
     <string name="permissions_label">"Разрешения"</string>
+    <string name="cache_header_label">"Кэш"</string>
+    <string name="clear_cache_btn_text">"Очистить кэш"</string>
+    <string name="cache_size_label">"Кэш"</string>
+    <!-- no translation found for controls_label (7611113077086853799) -->
+    <skip />
+    <!-- no translation found for force_stop (7435006169872876756) -->
+    <skip />
     <string name="total_size_label">"Всего"</string>
     <string name="application_size_label">"Приложение"</string>
     <string name="data_size_label">"Данные"</string>
@@ -614,6 +586,10 @@
     <string name="sort_order_alpha">"Сортировать"</string>
     <string name="sort_order_size">"Сортировать по размеру"</string>
     <string name="manage_space_text">"Управление памятью"</string>
+    <!-- no translation found for filter (2018011724373033887) -->
+    <skip />
+    <!-- no translation found for filter_dlg_title (6507663329723966854) -->
+    <skip />
     <string name="filter_apps_all">"Все"</string>
     <string name="filter_apps_third_party">"Сторонние"</string>
     <string name="filter_apps_running">"Выполняемые"</string>
@@ -627,22 +603,24 @@
     <string name="app_not_found_dlg_text">"Приложение не найдено в списке установленных приложений."</string>
     <string name="clear_data_failed">"Не удается очистить данные приложения."</string>
     <string name="security_settings_desc">"Это приложение имеет доступ к следующему на телефоне:"</string>
-    <string name="computing_size">"Идет расчет…"</string>
+    <!-- no translation found for computing_size (1599186977475211186) -->
+    <skip />
     <string name="invalid_size_value">"Невозможно вычислить размер пакета"</string>
     <string name="empty_list_msg">"У вас не установлено приложений сторонних разработчиков."</string>
-    <string name="cache_header_label">"Кэш"</string>
-    <string name="clear_cache_btn_text">"Очистить кэш"</string>
-    <string name="cache_size_label">"Кэш"</string>
     <string name="language_settings">"Локаль и текст"</string>
     <string name="language_settings_summary">"Выбор локали (языка и региона), параметров ввода текста и автоисправлений"</string>
     <string name="language_category">"Настройки локали"</string>
     <string name="text_category">"Настройки текста"</string>
     <string name="phone_language">"Выбрать локаль"</string>
+    <!-- no translation found for phone_language_summary (1809580675831352352) -->
+    <skip />
     <string name="auto_replace">"Автозамена"</string>
     <string name="auto_replace_summary">"Исправлять слова с опечатками"</string>
     <string name="auto_caps">"Автоматически заменять заглавной буквой"</string>
     <string name="auto_caps_summary">"Большие буквы в начале предложений"</string>
     <string name="auto_punctuate">"Автоматическая пунктуация"</string>
+    <!-- no translation found for hardkeyboard_category (5957168411305769899) -->
+    <skip />
     <string name="auto_punctuate_summary">"Чтобы вставить символ \".\", дважды нажмите пробел."</string>
     <string name="show_password">"Показывать пароли"</string>
     <string name="show_password_summary">"Показывать пароль при вводе"</string>
@@ -690,4 +668,68 @@
     <string name="keep_screen_on_summary">"При зарядке экран не отключается"</string>
     <string name="allow_mock_location">"Разрешить фиктивные местоположения"</string>
     <string name="allow_mock_location_summary">"Разрешить фиктивные местоположения"</string>
+    <!-- no translation found for battery_history_known_apps (6907374478255786240) -->
+    <skip />
+    <!-- no translation found for gadget_picker_title (4335873961457985189) -->
+    <skip />
+    <!-- no translation found for battery_history_details_for (5189636461798594740) -->
+    <skip />
+    <!-- no translation found for battery_history_uid (1016606150528436298) -->
+    <skip />
+    <!-- no translation found for battery_history_network_usage (8010852371665217020) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_received (980307569180518302) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_sent (2501748768602119159) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_total (4444807574361642753) -->
+    <skip />
+    <!-- no translation found for battery_history_cpu_usage (2597353713014790877) -->
+    <skip />
+    <!-- no translation found for battery_history_user_time (6227507614894791359) -->
+    <skip />
+    <!-- no translation found for battery_history_system_time (2015862072724507547) -->
+    <skip />
+    <!-- no translation found for battery_history_total_time (3618703970098556104) -->
+    <skip />
+    <!-- no translation found for battery_history_starts (9137453931978571696) -->
+    <skip />
+    <!-- no translation found for battery_history_days (6387593985264923377) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (2593055276272350197) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (5608990219891318138) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (7397664460929461350) -->
+    <skip />
+    <!-- no translation found for battery_history_packages_sharing_this_uid (4101596071379250050) -->
+    <skip />
+    <!-- no translation found for battery_history_no_data (1177238743237067617) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor (2333488996028993982) -->
+    <skip />
+    <!-- no translation found for battery_history_used_by_packages (3000711380023436470) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage (3593133338613209024) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage_multi (4536084375991014508) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on (1377240025275657277) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_battery (536058210445081888) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_plugged (5019127390021871260) -->
+    <skip />
+    <!-- no translation found for usage_stats_label (5890846333487083609) -->
+    <skip />
+    <!-- no translation found for testing_usage_stats (7823048598893937339) -->
+    <skip />
+    <!-- no translation found for display_order_text (8592776965827565271) -->
+    <skip />
+    <!-- no translation found for app_name_label (2000949925256858308) -->
+    <skip />
+    <!-- no translation found for launch_count_label (4019444833263957024) -->
+    <skip />
+    <!-- no translation found for usage_time_label (295954901452833058) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 6e15287..981f35f 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -53,4 +53,15 @@
     <!-- no translation found for wifi_sleep_policy_entries:0 (3804733751095821976) -->
     <!-- no translation found for wifi_sleep_policy_entries:1 (1549288661423279207) -->
     <!-- no translation found for wifi_sleep_policy_entries:2 (1986753720941888596) -->
+    <!-- no translation found for battery_history_type_spinner:0 (2372160040893842611) -->
+    <!-- no translation found for battery_history_type_spinner:1 (7042951832385599110) -->
+    <!-- no translation found for battery_history_type_spinner:2 (7643330117743172161) -->
+    <!-- no translation found for battery_history_type_spinner:3 (7984071435080498080) -->
+    <!-- no translation found for battery_history_which_spinner:0 (8777827398176661463) -->
+    <!-- no translation found for battery_history_which_spinner:1 (2351620008414691945) -->
+    <!-- no translation found for battery_history_which_spinner:2 (1233325583071371898) -->
+    <!-- no translation found for battery_history_which_spinner:3 (524850874274605031) -->
+    <!-- no translation found for usage_stats_display_order_types:0 (9077371706468756228) -->
+    <!-- no translation found for usage_stats_display_order_types:1 (1908750532762193304) -->
+    <!-- no translation found for usage_stats_display_order_types:2 (1213951670006606353) -->
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 56745bd..d7c3dea 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -16,9 +16,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="device_info_default">"未知"</string>
-    <string name="device_info_uptime">"正常使用时间"</string>
-    <string name="device_info_awaketime">"唤醒时间"</string>
-    <string name="device_info_asleeptime">"休眠时间"</string>
     <string name="turn_on_radio">"打开收音机"</string>
     <string name="turn_off_radio">"关闭收音机"</string>
     <string name="turn_on_qxdm">"启用 QXDM SD 日志"</string>
@@ -52,14 +49,13 @@
     <string name="radioInfo_lac">"LAC"</string>
     <string name="radioInfo_cid">"CID"</string>
     <string name="sdcard_unmount">"卸下 SD 卡"</string>
+    <!-- no translation found for sdcard_format (362497552060004057) -->
+    <skip />
     <string name="small_font">"小"</string>
     <string name="medium_font">"中"</string>
     <string name="large_font">"大"</string>
     <string name="font_size_save">"确定"</string>
     <string name="sdcard_setting">"SD 卡"</string>
-    <string name="screen_off_timeout_label">"充电时从不待机"</string>
-    <string name="stay_on">"充电时屏幕始终处于开启状态"</string>
-    <string name="app_launcher_newView_text">"新 AppLauncher"</string>
     <string name="battery_info_status_label">"电池状态："</string>
     <string name="battery_info_scale_label">"电池容量："</string>
     <string name="battery_info_level_label">"电池级别："</string>
@@ -87,11 +83,6 @@
     <string name="battery_info_health_over_voltage">"过电压"</string>
     <string name="battery_info_health_unspecified_failure">"未知错误"</string>
     <string name="bluetooth">"蓝牙"</string>
-    <string name="bluetooth_stopping">"蓝牙正在停止..."</string>
-    <string name="bluetooth_disabled">"打开蓝牙"</string>
-    <!-- no translation found for bluetooth_enabled (314506563815464155) -->
-    <skip />
-    <string name="bluetooth_enabling">"正在打开蓝牙..."</string>
     <string name="bluetooth_visibility">"可发现"</string>
     <string name="bluetooth_is_discoverable">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> 秒内可发现..."</string>
     <string name="bluetooth_not_discoverable">"让设备能被搜索到"</string>
@@ -99,7 +90,6 @@
     <string name="bluetooth_device_name">"设备名称"</string>
     <string name="bluetooth_name_not_set">"无名称集，使用帐户名"</string>
     <string name="bluetooth_scan_for_devices">"扫描以找到设备"</string>
-    <string name="bluetooth_clear_list">"清除设备列表"</string>
     <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>会断开连接。"</string>
     <string name="bluetooth_connected">"已连接"</string>
     <string name="bluetooth_disconnected">"已断开连接"</string>
@@ -108,17 +98,9 @@
     <!-- no translation found for bluetooth_unknown (644716244548801421) -->
     <skip />
     <string name="bluetooth_not_connected">"与此设备配对"</string>
-    <string name="bluetooth_failed_to_enable">"无法打开蓝牙"</string>
     <string name="bluetooth_pairing">"正在配对..."</string>
-    <string name="failed_to_pair">"无法与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对。"</string>
-    <string name="failed_to_connect">"无法连接至<xliff:g id="DEVICE_NAME">%1$s</xliff:g>。"</string>
     <string name="bluetooth_paired">"已配对"</string>
-    <string name="bluetooth_paired_not_nearby">"已配对"</string>
     <string name="bluetooth_device">"免持听筒/耳机"</string>
-    <string name="bluetooth_disconnect">"断开连接"</string>
-    <string name="bluetooth_connect">"连接"</string>
-    <string name="bluetooth_unpair">"取消配对"</string>
-    <string name="bluetooth_pair">"配对"</string>
     <string name="progress_scanning">"正在扫描"</string>
     <string name="bluetooth_notif_ticker">"蓝牙配对请求"</string>
     <string name="bluetooth_notif_title">"配对请求"</string>
@@ -136,16 +118,6 @@
     <string name="intent_sender_startactivity_text">"开始 <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>："</string>
     <string name="intent_sender_account_label">"帐户："</string>
-    <string name="keyguard_pw_mod_text">"选择锁定图案"</string>
-    <string name="keyguard_pin_mod_text">"更改 PIN 码"</string>
-    <string name="keyguard_label">"键盘锁"</string>
-    <string name="keyguard_sim_pin_label">"SIM 卡 PIN 码"</string>
-    <string name="keyguard_password_old_password_error_text">"您键入的旧密码不正确。请重试。"</string>
-    <string name="keyguard_password_button_text">"确定"</string>
-    <string name="keyguard_password_confirm_new_label">"确认新密码："</string>
-    <string name="keyguard_password_new_label">"新密码："</string>
-    <string name="keyguard_password_old_label">"旧密码："</string>
-    <string name="keyguard_password_mismatch_error_text">"两个密码不一致。请重新键入。"</string>
     <string name="proxy_clear_text">"清除"</string>
     <string name="proxy_port_label">"端口"</string>
     <string name="proxy_defaultView_text">"恢复默认值"</string>
@@ -188,15 +160,13 @@
     <string name="radio_info_smsc_label">"SMSC："</string>
     <string name="radio_info_smsc_update_label">"更新"</string>
     <string name="radio_info_smsc_refresh_label">"刷新"</string>
+    <!-- no translation found for radio_info_toggle_dns_check_label (8292252930563286858) -->
+    <skip />
     <string name="band_mode_title">"设置 GSM/UMTS 波段"</string>
     <string name="band_mode_loading">"正在载入波段列表..."</string>
     <string name="band_mode_set">"设置"</string>
     <string name="band_mode_failed">"失败"</string>
     <string name="band_mode_succeeded">"成功"</string>
-    <string name="ringer_volume_ringer_mode_label">"响铃模式"</string>
-    <string name="ringer_volume_screen_increasing_text">"铃声渐强"</string>
-    <string name="ringer_volume_ringtone_label">"铃声"</string>
-    <string name="ringer_volume_instructions">"使用音量按钮调节振铃音量"</string>
     <string name="sdcard_changes_instructions">"更改会在重新连接 USB 电缆后生效"</string>
     <string name="sdcard_settings_screen_mass_storage_text">"启用 USB 大容量存储"</string>
     <string name="sdcard_settings_total_bytes_label">"字节总数："</string>
@@ -208,20 +178,6 @@
     <string name="sdcard_settings_used_bytes_label">"使用的字节数："</string>
     <string name="sdcard_settings_scanning_status">"正在扫描 SD 卡以获取媒体..."</string>
     <string name="sdcard_settings_read_only_status">"装载的 SD 卡为只读"</string>
-    <string name="sdcard_removal_alert_title">"卸下 SD 卡的操作不安全！"</string>
-    <string name="sdcard_unmountable_alert_title">"SD 卡不可读"</string>
-    <string name="telephony_user_label">"用户："</string>
-    <string name="telephony_server_label">"服务器："</string>
-    <string name="telephony_name_label">"名称："</string>
-    <string name="telephony_mmsc_label">"MMSC："</string>
-    <string name="telephony_apn_label">"APN："</string>
-    <string name="telephony_mcc_label">"MCC："</string>
-    <string name="telephony_port_label">"端口："</string>
-    <string name="telephony_password_label">"密码："</string>
-    <string name="telephony_proxy_label">"代理："</string>
-    <string name="telephony_mnc_label">"MNC："</string>
-    <string name="telephony_mmsproxy_label">"彩信代理："</string>
-    <string name="telephony_mmsport_label">"彩信端口："</string>
     <string name="next_label">"下一步"</string>
     <string name="language_picker_title">"区域"</string>
     <string name="select_your_language">"选择语言"</string>
@@ -264,23 +220,12 @@
     <string name="bluetooth_settings_summary">"管理连接，设置设备名称和可发现性"</string>
     <string name="bluetooth_pin_entry">"蓝牙配对请求"</string>
     <string name="bluetooth_device_info">"蓝牙设备信息"</string>
-    <string name="bluetooth_pairing_msg">"正在配对..."</string>
     <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"键入 PIN 码以配对。"\n"（尝试键入 0000 或 1234。）"</string>
     <string name="bluetooth_error_title">"注意"</string>
     <string name="bluetooth_pairing_error_message">"与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对时出现问题。"</string>
-    <string name="bluetooth_pairing_alternate_error_message">"与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对时出现问题。请尝试使用其他 PIN 码。"</string>
     <string name="bluetooth_pairing_pin_error_message">"与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对时出现问题，因为键入的 PIN 码不正确。"</string>
     <string name="bluetooth_connecting_error_message">"连接至<xliff:g id="DEVICE_NAME">%1$s</xliff:g>时出现问题。"</string>
-    <string name="bluetooth_new_data">"键入新数据"</string>
-    <string name="bluetooth_new_data_confirm">"确定"</string>
-    <string name="bluetooth_new_data_cancel">"取消"</string>
-    <string name="bluetooth_scan_for_new_devices">"正在扫描以找到新设备..."</string>
-    <string name="bluetooth_discoverability_panel_title">"让我..."</string>
-    <string name="bluetooth_discoverable">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> 秒内可发现"</string>
-    <string name="bluetooth_connectable">"只可连接"</string>
-    <string name="bluetooth_neither">"既不可发现也不可连接"</string>
     <string name="bluetooth_preference_scan_title">"扫描以找到设备"</string>
-    <string name="bluetooth_preference_scan_summary">"查找要配对的设备"</string>
     <string name="bluetooth_device_context_connect">"连接"</string>
     <string name="bluetooth_device_context_disconnect">"断开连接"</string>
     <string name="bluetooth_device_context_pair_connect">"配对和连接"</string>
@@ -420,32 +365,24 @@
     <string name="sound_effects_enable_title">"操作音选择"</string>
     <string name="sound_effects_enable_summary_on">"进行屏幕选择时发出声音"</string>
     <string name="sound_effects_enable_summary_off">"进行屏幕选择时发出声音"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_title (1008791464029179529) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (426729807044947187) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (803791141563778934) -->
+    <skip />
     <string name="sync_settings">"数据同步"</string>
     <string name="sync_settings_summary">"选择同步哪些应用程序"</string>
-    <string name="sync_settings_header_general_settings">"常规同步设置"</string>
-    <string name="sync_settings_header_application_settings">"应用程序同步设置"</string>
-    <string name="sync_too_many_deletes">"超出了删除限制"</string>
-    <string name="sync_automatically">"自动同步"</string>
-    <string name="sync_enabled">"自动同步数据"</string>
-    <string name="sync_disabled">"选择以自动同步数据"</string>
-    <string name="sync_menu_sync_now">"立即同步"</string>
-    <string name="sync_menu_sync_cancel">"取消同步"</string>
-    <string name="sync_gmail">"Gmail"</string>
-    <string name="sync_calendar">"日历"</string>
-    <string name="sync_contacts">"联系人"</string>
-    <string name="sync_too_many_deletes_desc">"对于<xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>、帐户 <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>，有 <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> 个删除的项目。您希望执行什么操作？"</string>
-    <string name="sync_really_delete">"删除这些项目。"</string>
-    <string name="sync_undo_deletes">"撤消删除操作。"</string>
-    <string name="sync_do_nothing">"现在什么都不做。"</string>
-    <string name="sync_is_failing">"同步操作当前遇到了一些问题，很快便可恢复。"</string>
-    <string name="sync_plug"><font fgcolor="#ffffffff">"欢迎使用 Google Sync！"</font>\n"这是一种同步数据以允许您从任何位置访问您的联系人、约会以及更多信息的 Google 方法。"</string>
     <string name="display_settings">"显示设置"</string>
     <string name="animations_title">"动画"</string>
     <string name="animations_summary_on">"打开/关闭窗口时显示动画"</string>
     <string name="animations_summary_off">"打开/关闭窗口时显示动画"</string>
     <string name="brightness">"亮度"</string>
+    <!-- no translation found for brightness_summary (838917350127550703) -->
+    <skip />
     <string name="screen_timeout">"屏幕待机"</string>
-    <string name="dim_screen">"屏幕变暗"</string>
+    <!-- no translation found for screen_timeout_summary (2905757633140605334) -->
+    <skip />
     <string name="sim_lock_settings">"SIM 卡锁定设置"</string>
     <string name="sim_lock_settings_category">"设置 SIM 卡锁定"</string>
     <string name="sim_lock_settings_title">"SIM 卡锁定"</string>
@@ -493,13 +430,24 @@
     <string name="status_wifi_mac_address">"Wi-Fi MAC 地址"</string>
     <string name="status_bt_address">"蓝牙地址"</string>
     <string name="status_unavailable">"不可用"</string>
+    <!-- no translation found for status_network_traffic_stats (2089739529980224804) -->
+    <skip />
+    <!-- no translation found for status_network_traffic_summary (1456797220417923108) -->
+    <skip />
     <string name="status_up_time">"正常使用时间"</string>
     <string name="status_awake_time">"唤醒时间"</string>
     <string name="internal_memory">"手机内部存储"</string>
     <string name="sd_memory">"SD 卡"</string>
     <string name="memory_available">"可用的空间"</string>
     <string name="memory_size">"空间总量"</string>
-    <string name="sd_eject">"卸下/弹出 SD 卡"</string>
+    <!-- no translation found for sd_eject (6915293408836853020) -->
+    <skip />
+    <!-- no translation found for sd_eject_summary (3315557796211542962) -->
+    <skip />
+    <!-- no translation found for sd_format (5448738337382712203) -->
+    <skip />
+    <!-- no translation found for sd_format_summary (6616491027883134004) -->
+    <skip />
     <string name="sd_unavailable">"不可用"</string>
     <string name="read_only">"（只读）"</string>
     <string name="battery_status_title">"电池状态"</string>
@@ -538,6 +486,22 @@
     <string name="master_clear_gesture_prompt">"绘制解锁图案"</string>
     <string name="master_clear_gesture_explanation">"您必须绘制解锁图案才能确认手机重设。"</string>
     <string name="master_clear_failed">"未执行重设，因为 System Clear 服务不可用。"</string>
+    <!-- no translation found for media_format_title (4671276096695789895) -->
+    <skip />
+    <!-- no translation found for media_format_summary (3805714639375830120) -->
+    <skip />
+    <!-- no translation found for media_format_desc (1142563222357820834) -->
+    <skip />
+    <!-- no translation found for media_format_button_text (370856400090190151) -->
+    <skip />
+    <!-- no translation found for media_format_final_desc (1776666694910717198) -->
+    <skip />
+    <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_prompt (3109349468816856670) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_explanation (4239529439389660159) -->
+    <skip />
     <string name="call_settings_title">"通话设置"</string>
     <string name="call_settings_summary">"设置语音信箱、呼叫转移、呼叫等待、呼叫者 ID"</string>
     <string name="network_settings_title">"移动网络"</string>
@@ -591,17 +555,25 @@
     <string name="lock_example_title">"示例图案"</string>
     <string name="lock_example_message">"连接至少四个点。"\n\n"准备好绘制自己的图案后选择“下一步”。"</string>
     <string name="manageapplications_settings_title">"管理应用程序"</string>
+    <!-- no translation found for manageapplications_settings_summary (6097117021500651232) -->
+    <skip />
     <string name="applications_settings">"应用程序"</string>
     <string name="applications_settings_summary">"管理应用程序，设置快速启动快捷键"</string>
     <string name="applications_settings_header">"应用程序设置"</string>
     <string name="install_applications">"未知源"</string>
     <string name="install_unknown_applications">"允许安装非市场应用程序"</string>
     <string name="install_all_warning">"您的手机和个人数据很容易受到来自未知源的应用程序的攻击。您同意单方面承担由于使用这些应用程序而可能对您的手机造成的任何损坏或数据丢失的责任。"</string>
-    <string name="manage_applications_title">"管理应用程序"</string>
     <string name="application_info_label">"应用程序信息"</string>
     <string name="storage_label">"存储"</string>
     <string name="auto_launch_label">"默认情况下启动"</string>
     <string name="permissions_label">"权限"</string>
+    <string name="cache_header_label">"缓存"</string>
+    <string name="clear_cache_btn_text">"清除缓存"</string>
+    <string name="cache_size_label">"缓存"</string>
+    <!-- no translation found for controls_label (7611113077086853799) -->
+    <skip />
+    <!-- no translation found for force_stop (7435006169872876756) -->
+    <skip />
     <string name="total_size_label">"总量"</string>
     <string name="application_size_label">"应用程序"</string>
     <string name="data_size_label">"数据"</string>
@@ -614,6 +586,10 @@
     <string name="sort_order_alpha">"排序"</string>
     <string name="sort_order_size">"按大小排序"</string>
     <string name="manage_space_text">"管理空间"</string>
+    <!-- no translation found for filter (2018011724373033887) -->
+    <skip />
+    <!-- no translation found for filter_dlg_title (6507663329723966854) -->
+    <skip />
     <string name="filter_apps_all">"全部"</string>
     <string name="filter_apps_third_party">"第三方"</string>
     <string name="filter_apps_running">"正在运行"</string>
@@ -627,22 +603,24 @@
     <string name="app_not_found_dlg_text">"未在已安装的应用程序的列表中找到该应用程序。"</string>
     <string name="clear_data_failed">"无法清除应用程序数据。"</string>
     <string name="security_settings_desc">"此应用程序可访问您手机上的以下内容："</string>
-    <string name="computing_size">"仍在计算..."</string>
+    <!-- no translation found for computing_size (1599186977475211186) -->
+    <skip />
     <string name="invalid_size_value">"无法计算包大小"</string>
     <string name="empty_list_msg">"您尚未安装任何第三方应用程序。"</string>
-    <string name="cache_header_label">"缓存"</string>
-    <string name="clear_cache_btn_text">"清除缓存"</string>
-    <string name="cache_size_label">"缓存"</string>
     <string name="language_settings">"区域和文本"</string>
     <string name="language_settings_summary">"设置区域（语言和区域）、文本输入和自动纠错选项"</string>
     <string name="language_category">"区域设置"</string>
     <string name="text_category">"文本设置"</string>
     <string name="phone_language">"选择区域"</string>
+    <!-- no translation found for phone_language_summary (1809580675831352352) -->
+    <skip />
     <string name="auto_replace">"自动替换"</string>
     <string name="auto_replace_summary">"纠正错误键入的词"</string>
     <string name="auto_caps">"自动大写"</string>
     <string name="auto_caps_summary">"将句子中的首字母大写"</string>
     <string name="auto_punctuate">"自动加标点"</string>
+    <!-- no translation found for hardkeyboard_category (5957168411305769899) -->
+    <skip />
     <string name="auto_punctuate_summary">"按两次空格键来插入“。”"</string>
     <string name="show_password">"可见的密码"</string>
     <string name="show_password_summary">"键入时显示密码"</string>
@@ -690,4 +668,68 @@
     <string name="keep_screen_on_summary">"充电时屏幕不会休眠"</string>
     <string name="allow_mock_location">"允许模仿位置"</string>
     <string name="allow_mock_location_summary">"允许模仿位置"</string>
+    <!-- no translation found for battery_history_known_apps (6907374478255786240) -->
+    <skip />
+    <!-- no translation found for gadget_picker_title (4335873961457985189) -->
+    <skip />
+    <!-- no translation found for battery_history_details_for (5189636461798594740) -->
+    <skip />
+    <!-- no translation found for battery_history_uid (1016606150528436298) -->
+    <skip />
+    <!-- no translation found for battery_history_network_usage (8010852371665217020) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_received (980307569180518302) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_sent (2501748768602119159) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_total (4444807574361642753) -->
+    <skip />
+    <!-- no translation found for battery_history_cpu_usage (2597353713014790877) -->
+    <skip />
+    <!-- no translation found for battery_history_user_time (6227507614894791359) -->
+    <skip />
+    <!-- no translation found for battery_history_system_time (2015862072724507547) -->
+    <skip />
+    <!-- no translation found for battery_history_total_time (3618703970098556104) -->
+    <skip />
+    <!-- no translation found for battery_history_starts (9137453931978571696) -->
+    <skip />
+    <!-- no translation found for battery_history_days (6387593985264923377) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (2593055276272350197) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (5608990219891318138) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (7397664460929461350) -->
+    <skip />
+    <!-- no translation found for battery_history_packages_sharing_this_uid (4101596071379250050) -->
+    <skip />
+    <!-- no translation found for battery_history_no_data (1177238743237067617) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor (2333488996028993982) -->
+    <skip />
+    <!-- no translation found for battery_history_used_by_packages (3000711380023436470) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage (3593133338613209024) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage_multi (4536084375991014508) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on (1377240025275657277) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_battery (536058210445081888) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_plugged (5019127390021871260) -->
+    <skip />
+    <!-- no translation found for usage_stats_label (5890846333487083609) -->
+    <skip />
+    <!-- no translation found for testing_usage_stats (7823048598893937339) -->
+    <skip />
+    <!-- no translation found for display_order_text (8592776965827565271) -->
+    <skip />
+    <!-- no translation found for app_name_label (2000949925256858308) -->
+    <skip />
+    <!-- no translation found for launch_count_label (4019444833263957024) -->
+    <skip />
+    <!-- no translation found for usage_time_label (295954901452833058) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 8c498b8..0027a2c 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -53,4 +53,15 @@
     <!-- no translation found for wifi_sleep_policy_entries:0 (3804733751095821976) -->
     <!-- no translation found for wifi_sleep_policy_entries:1 (1549288661423279207) -->
     <!-- no translation found for wifi_sleep_policy_entries:2 (1986753720941888596) -->
+    <!-- no translation found for battery_history_type_spinner:0 (2372160040893842611) -->
+    <!-- no translation found for battery_history_type_spinner:1 (7042951832385599110) -->
+    <!-- no translation found for battery_history_type_spinner:2 (7643330117743172161) -->
+    <!-- no translation found for battery_history_type_spinner:3 (7984071435080498080) -->
+    <!-- no translation found for battery_history_which_spinner:0 (8777827398176661463) -->
+    <!-- no translation found for battery_history_which_spinner:1 (2351620008414691945) -->
+    <!-- no translation found for battery_history_which_spinner:2 (1233325583071371898) -->
+    <!-- no translation found for battery_history_which_spinner:3 (524850874274605031) -->
+    <!-- no translation found for usage_stats_display_order_types:0 (9077371706468756228) -->
+    <!-- no translation found for usage_stats_display_order_types:1 (1908750532762193304) -->
+    <!-- no translation found for usage_stats_display_order_types:2 (1213951670006606353) -->
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 95d6c73..ae8a0d4 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -16,9 +16,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="device_info_default">"未知的"</string>
-    <string name="device_info_uptime">"已開機時間"</string>
-    <string name="device_info_awaketime">"清醒時間"</string>
-    <string name="device_info_asleeptime">"睡眠時間"</string>
     <string name="turn_on_radio">"開啟無線通訊"</string>
     <string name="turn_off_radio">"關閉無線通訊"</string>
     <string name="turn_on_qxdm">"啟用 QXDM SD 記錄"</string>
@@ -52,14 +49,13 @@
     <string name="radioInfo_lac">"LAC"</string>
     <string name="radioInfo_cid">"CID"</string>
     <string name="sdcard_unmount">"卸載 SD 卡"</string>
+    <!-- no translation found for sdcard_format (362497552060004057) -->
+    <skip />
     <string name="small_font">"小"</string>
     <string name="medium_font">"中"</string>
     <string name="large_font">"大"</string>
     <string name="font_size_save">"確定"</string>
     <string name="sdcard_setting">"SD 卡"</string>
-    <string name="screen_off_timeout_label">"充電時不逾時"</string>
-    <string name="stay_on">"充電時螢幕永遠開啟"</string>
-    <string name="app_launcher_newView_text">"新的程式啟動器"</string>
     <string name="battery_info_status_label">"電池狀態："</string>
     <string name="battery_info_scale_label">"電池計量："</string>
     <string name="battery_info_level_label">"電池計量："</string>
@@ -87,11 +83,6 @@
     <string name="battery_info_health_over_voltage">"電壓過高"</string>
     <string name="battery_info_health_unspecified_failure">"未知的錯誤"</string>
     <string name="bluetooth">"藍牙"</string>
-    <string name="bluetooth_stopping">"停止藍牙中..."</string>
-    <string name="bluetooth_disabled">"開啟藍牙"</string>
-    <!-- no translation found for bluetooth_enabled (314506563815464155) -->
-    <skip />
-    <string name="bluetooth_enabling">"開啟藍牙中..."</string>
     <string name="bluetooth_visibility">"無法測得"</string>
     <string name="bluetooth_is_discoverable">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> 秒無法測得..."</string>
     <string name="bluetooth_not_discoverable">"設定裝置為可偵測"</string>
@@ -99,7 +90,6 @@
     <string name="bluetooth_device_name">"裝置名稱"</string>
     <string name="bluetooth_name_not_set">"未設定名稱，使用帳戶名稱"</string>
     <string name="bluetooth_scan_for_devices">"掃描裝置"</string>
-    <string name="bluetooth_clear_list">"清除裝置清單"</string>
     <string name="bluetooth_disconnect_blank">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>即將斷線。"</string>
     <string name="bluetooth_connected">"已連線"</string>
     <string name="bluetooth_disconnected">"連線中斷"</string>
@@ -108,17 +98,9 @@
     <!-- no translation found for bluetooth_unknown (644716244548801421) -->
     <skip />
     <string name="bluetooth_not_connected">"與此裝置配對"</string>
-    <string name="bluetooth_failed_to_enable">"無法開啟藍牙"</string>
     <string name="bluetooth_pairing">"配對中..."</string>
-    <string name="failed_to_pair">"無法與<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配對。"</string>
-    <string name="failed_to_connect">"無法連線到 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>。"</string>
     <string name="bluetooth_paired">"已配對"</string>
-    <string name="bluetooth_paired_not_nearby">"已配對"</string>
     <string name="bluetooth_device">"免持/頭戴式"</string>
-    <string name="bluetooth_disconnect">"斷線"</string>
-    <string name="bluetooth_connect">"連線"</string>
-    <string name="bluetooth_unpair">"解除配對"</string>
-    <string name="bluetooth_pair">"配對"</string>
     <string name="progress_scanning">"掃描中"</string>
     <string name="bluetooth_notif_ticker">"藍牙配對要求"</string>
     <string name="bluetooth_notif_title">"配對要求"</string>
@@ -136,16 +118,6 @@
     <string name="intent_sender_startactivity_text">"開始 <xliff:g id="ACTIVITY">activity</xliff:g>"</string>
     <string name="intent_sender_resource_label">"<xliff:g id="RESOURCE">Resource</xliff:g>："</string>
     <string name="intent_sender_account_label">"帳戶："</string>
-    <string name="keyguard_pw_mod_text">"選取鎖定圖形"</string>
-    <string name="keyguard_pin_mod_text">"變更 PIN"</string>
-    <string name="keyguard_label">"鍵盤鎖"</string>
-    <string name="keyguard_sim_pin_label">"SIM PIN"</string>
-    <string name="keyguard_password_old_password_error_text">"您輸入的舊密碼不正確。請再試一次。"</string>
-    <string name="keyguard_password_button_text">"確定"</string>
-    <string name="keyguard_password_confirm_new_label">"確認新密碼："</string>
-    <string name="keyguard_password_new_label">"新的密碼："</string>
-    <string name="keyguard_password_old_label">"舊的密碼："</string>
-    <string name="keyguard_password_mismatch_error_text">"兩組密碼不符。請再輸入一次。"</string>
     <string name="proxy_clear_text">"清除"</string>
     <string name="proxy_port_label">"連接埠"</string>
     <string name="proxy_defaultView_text">"還原預設值"</string>
@@ -188,15 +160,13 @@
     <string name="radio_info_smsc_label">"SMSC："</string>
     <string name="radio_info_smsc_update_label">"更新"</string>
     <string name="radio_info_smsc_refresh_label">"重新整理"</string>
+    <!-- no translation found for radio_info_toggle_dns_check_label (8292252930563286858) -->
+    <skip />
     <string name="band_mode_title">"設定 GSM/UMTS 頻道"</string>
     <string name="band_mode_loading">"載入頻道清單..."</string>
     <string name="band_mode_set">"設定"</string>
     <string name="band_mode_failed">"失敗"</string>
     <string name="band_mode_succeeded">"成功"</string>
-    <string name="ringer_volume_ringer_mode_label">"鈴聲模式："</string>
-    <string name="ringer_volume_screen_increasing_text">"鈴聲逐漸增強"</string>
-    <string name="ringer_volume_ringtone_label">"鈴聲"</string>
-    <string name="ringer_volume_instructions">"使用音量鍵調整鈴聲音量"</string>
     <string name="sdcard_changes_instructions">"USB 纜線重新連接時，變更才會生效"</string>
     <string name="sdcard_settings_screen_mass_storage_text">"啟用 USB 大量儲存裝置"</string>
     <string name="sdcard_settings_total_bytes_label">"總容量 (bytes)："</string>
@@ -208,20 +178,6 @@
     <string name="sdcard_settings_used_bytes_label">"使用容量 (bytes)："</string>
     <string name="sdcard_settings_scanning_status">"從 SD 卡掃描媒體中..."</string>
     <string name="sdcard_settings_read_only_status">"SD 卡為唯讀狀態"</string>
-    <string name="sdcard_removal_alert_title">"未正確移除 SD 卡！"</string>
-    <string name="sdcard_unmountable_alert_title">"無法讀取 SD 卡"</string>
-    <string name="telephony_user_label">"使用者："</string>
-    <string name="telephony_server_label">"伺服器："</string>
-    <string name="telephony_name_label">"名稱："</string>
-    <string name="telephony_mmsc_label">"MMSC："</string>
-    <string name="telephony_apn_label">"APN："</string>
-    <string name="telephony_mcc_label">"MCC："</string>
-    <string name="telephony_port_label">"連接埠："</string>
-    <string name="telephony_password_label">"密碼："</string>
-    <string name="telephony_proxy_label">"Proxy："</string>
-    <string name="telephony_mnc_label">"MNC："</string>
-    <string name="telephony_mmsproxy_label">"MMS proxy："</string>
-    <string name="telephony_mmsport_label">"MMS 連接埠："</string>
     <string name="next_label">"下一步"</string>
     <string name="language_picker_title">"地區"</string>
     <string name="select_your_language">"選取語言"</string>
@@ -264,23 +220,12 @@
     <string name="bluetooth_settings_summary">"管理連線、設定裝置名稱與可偵測性"</string>
     <string name="bluetooth_pin_entry">"藍牙配對要求"</string>
     <string name="bluetooth_device_info">"藍牙裝置資訊"</string>
-    <string name="bluetooth_pairing_msg">"配對中..."</string>
     <string name="bluetooth_enter_pin_msg">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"\n\n"輸入 PIN 進行配對。"\n"(請嘗試 0000 或 1234。)"</string>
     <string name="bluetooth_error_title">"注意"</string>
     <string name="bluetooth_pairing_error_message">"與<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配對時發生問題。"</string>
-    <string name="bluetooth_pairing_alternate_error_message">"與<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配對時發生問題。請嘗試其他的 PIN。"</string>
     <string name="bluetooth_pairing_pin_error_message">"由於輸入的 PIN 不正確，因此無法與<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配對。"</string>
     <string name="bluetooth_connecting_error_message">"連接至<xliff:g id="DEVICE_NAME">%1$s</xliff:g>時發生問題。"</string>
-    <string name="bluetooth_new_data">"輸入新資料"</string>
-    <string name="bluetooth_new_data_confirm">"確定"</string>
-    <string name="bluetooth_new_data_cancel">"取消"</string>
-    <string name="bluetooth_scan_for_new_devices">"掃描新裝置..."</string>
-    <string name="bluetooth_discoverability_panel_title">"讓我..."</string>
-    <string name="bluetooth_discoverable">"<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g> 秒無法測得"</string>
-    <string name="bluetooth_connectable">"只能連線"</string>
-    <string name="bluetooth_neither">"無法被偵測或連線"</string>
     <string name="bluetooth_preference_scan_title">"掃描裝置"</string>
-    <string name="bluetooth_preference_scan_summary">"尋找要配對的裝置"</string>
     <string name="bluetooth_device_context_connect">"連線"</string>
     <string name="bluetooth_device_context_disconnect">"斷線"</string>
     <string name="bluetooth_device_context_pair_connect">"配對並連線"</string>
@@ -420,32 +365,24 @@
     <string name="sound_effects_enable_title">"可聽見選項"</string>
     <string name="sound_effects_enable_summary_on">"使用螢幕選取時播放音效"</string>
     <string name="sound_effects_enable_summary_off">"使用螢幕選取時播放音效"</string>
+    <!-- no translation found for play_media_notification_sounds_enable_title (1008791464029179529) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_on (426729807044947187) -->
+    <skip />
+    <!-- no translation found for play_media_notification_sounds_enable_summary_off (803791141563778934) -->
+    <skip />
     <string name="sync_settings">"資料同步化"</string>
     <string name="sync_settings_summary">"選取要同步處理的應用程式"</string>
-    <string name="sync_settings_header_general_settings">"一般同步處理設定"</string>
-    <string name="sync_settings_header_application_settings">"應用程式同步處理設定"</string>
-    <string name="sync_too_many_deletes">"已達刪除限制"</string>
-    <string name="sync_automatically">"自動同步處理"</string>
-    <string name="sync_enabled">"自動同步處理資料"</string>
-    <string name="sync_disabled">"自動進行資料同步處理"</string>
-    <string name="sync_menu_sync_now">"現在進行同步處理"</string>
-    <string name="sync_menu_sync_cancel">"取消同步處理"</string>
-    <string name="sync_gmail">"Gmail"</string>
-    <string name="sync_calendar">"日曆"</string>
-    <string name="sync_contacts">"聯絡人"</string>
-    <string name="sync_too_many_deletes_desc">"<xliff:g id="ACCOUNT_NAME">%3$s</xliff:g> 帳戶的 <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g> 有 <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> 個項目即將刪除。您確定要繼續嗎？"</string>
-    <string name="sync_really_delete">"刪除此項目。"</string>
-    <string name="sync_undo_deletes">"復原刪除。"</string>
-    <string name="sync_do_nothing">"目前不做操作。"</string>
-    <string name="sync_is_failing">"目前同步處理發生問題。稍後會回復正常。"</string>
-    <string name="sync_plug"><font fgcolor="#ffffffff">" 歡迎使用 Google Sync！"</font>" "\n" Google 同步資料處理方式讓您無論身在何處，都可存取通訊錄、約會或其他資訊。"</string>
     <string name="display_settings">"顯示設定"</string>
     <string name="animations_title">"動畫"</string>
     <string name="animations_summary_on">"開啟/關閉視窗時顯示動畫"</string>
     <string name="animations_summary_off">"開啟/關閉視窗時顯示動畫"</string>
     <string name="brightness">"亮度"</string>
+    <!-- no translation found for brightness_summary (838917350127550703) -->
+    <skip />
     <string name="screen_timeout">"螢幕逾時"</string>
-    <string name="dim_screen">"螢幕調暗"</string>
+    <!-- no translation found for screen_timeout_summary (2905757633140605334) -->
+    <skip />
     <string name="sim_lock_settings">"SIM 卡鎖定設定"</string>
     <string name="sim_lock_settings_category">"設定 SIM 卡鎖定"</string>
     <string name="sim_lock_settings_title">"SIM 卡鎖定"</string>
@@ -493,13 +430,24 @@
     <string name="status_wifi_mac_address">"Wi-Fi MAC 位址"</string>
     <string name="status_bt_address">"藍牙位址"</string>
     <string name="status_unavailable">"無法取得"</string>
+    <!-- no translation found for status_network_traffic_stats (2089739529980224804) -->
+    <skip />
+    <!-- no translation found for status_network_traffic_summary (1456797220417923108) -->
+    <skip />
     <string name="status_up_time">"開機時間"</string>
     <string name="status_awake_time">"清醒時間"</string>
     <string name="internal_memory">"手機內部記憶體"</string>
     <string name="sd_memory">"SD 卡"</string>
     <string name="memory_available">"可用空間"</string>
     <string name="memory_size">"總空間"</string>
-    <string name="sd_eject">"卸載/退出 SD 卡"</string>
+    <!-- no translation found for sd_eject (6915293408836853020) -->
+    <skip />
+    <!-- no translation found for sd_eject_summary (3315557796211542962) -->
+    <skip />
+    <!-- no translation found for sd_format (5448738337382712203) -->
+    <skip />
+    <!-- no translation found for sd_format_summary (6616491027883134004) -->
+    <skip />
     <string name="sd_unavailable">"無法取得資訊"</string>
     <string name="read_only">"(唯讀)"</string>
     <string name="battery_status_title">"電池狀態"</string>
@@ -538,6 +486,22 @@
     <string name="master_clear_gesture_prompt">"畫出解鎖圖形"</string>
     <string name="master_clear_gesture_explanation">"請畫出解鎖圖形，以確認重設手機。"</string>
     <string name="master_clear_failed">"因「系統清除」服務異常，未成功執行重設。"</string>
+    <!-- no translation found for media_format_title (4671276096695789895) -->
+    <skip />
+    <!-- no translation found for media_format_summary (3805714639375830120) -->
+    <skip />
+    <!-- no translation found for media_format_desc (1142563222357820834) -->
+    <skip />
+    <!-- no translation found for media_format_button_text (370856400090190151) -->
+    <skip />
+    <!-- no translation found for media_format_final_desc (1776666694910717198) -->
+    <skip />
+    <!-- no translation found for media_format_final_button_text (4881713344315923175) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_prompt (3109349468816856670) -->
+    <skip />
+    <!-- no translation found for media_format_gesture_explanation (4239529439389660159) -->
+    <skip />
     <string name="call_settings_title">"通話設定"</string>
     <string name="call_settings_summary">"設定語音信箱、來電指定轉接、話中插接、本機號碼"</string>
     <string name="network_settings_title">"行動網路"</string>
@@ -591,17 +555,25 @@
     <string name="lock_example_title">"範例圖形"</string>
     <string name="lock_example_message">"畫出圖形時，需要至少連接四個點。"\n" "\n"準備好要畫出您的解鎖圖形時，請選取 [下一步]。"</string>
     <string name="manageapplications_settings_title">"管理應用程式"</string>
+    <!-- no translation found for manageapplications_settings_summary (6097117021500651232) -->
+    <skip />
     <string name="applications_settings">"應用程式"</string>
     <string name="applications_settings_summary">"管理應用程式，設定快速啟動捷徑"</string>
     <string name="applications_settings_header">"應用程式設定"</string>
     <string name="install_applications">"未知的來源"</string>
     <string name="install_unknown_applications">"允許安裝非市場應用程式"</string>
     <string name="install_all_warning">"如果是未知來源的應用程式，便比較可能攻擊您的手機與個人資訊。若使用這些應用程式造成手機受損或資料遺失，您必須為此完全負責。"</string>
-    <string name="manage_applications_title">"管理應用程式"</string>
     <string name="application_info_label">"應用程式資訊"</string>
     <string name="storage_label">"儲存"</string>
     <string name="auto_launch_label">"依預設值啟動"</string>
     <string name="permissions_label">"許可"</string>
+    <string name="cache_header_label">"快取"</string>
+    <string name="clear_cache_btn_text">"清除快取"</string>
+    <string name="cache_size_label">"快取"</string>
+    <!-- no translation found for controls_label (7611113077086853799) -->
+    <skip />
+    <!-- no translation found for force_stop (7435006169872876756) -->
+    <skip />
     <string name="total_size_label">"總共"</string>
     <string name="application_size_label">"應用程式"</string>
     <string name="data_size_label">"資料"</string>
@@ -614,6 +586,10 @@
     <string name="sort_order_alpha">"排序"</string>
     <string name="sort_order_size">"依大小排序"</string>
     <string name="manage_space_text">"管理空間"</string>
+    <!-- no translation found for filter (2018011724373033887) -->
+    <skip />
+    <!-- no translation found for filter_dlg_title (6507663329723966854) -->
+    <skip />
     <string name="filter_apps_all">"全部"</string>
     <string name="filter_apps_third_party">"第三方"</string>
     <string name="filter_apps_running">"執行中"</string>
@@ -627,22 +603,24 @@
     <string name="app_not_found_dlg_text">"在已安裝程式清單中找不到此應用程式。"</string>
     <string name="clear_data_failed">"無法清除應用程式資料。"</string>
     <string name="security_settings_desc">"此應用程式可存取您電話中的下列項目："</string>
-    <string name="computing_size">"仍在計算中..."</string>
+    <!-- no translation found for computing_size (1599186977475211186) -->
+    <skip />
     <string name="invalid_size_value">"無法計算封裝大小"</string>
     <string name="empty_list_msg">"您尚未安裝任何的第三方應用程式。"</string>
-    <string name="cache_header_label">"快取"</string>
-    <string name="clear_cache_btn_text">"清除快取"</string>
-    <string name="cache_size_label">"快取"</string>
     <string name="language_settings">"地區與文字"</string>
     <string name="language_settings_summary">"設定地區 (語言和地區)、文字輸入和文字自動校正選項"</string>
     <string name="language_category">"地區設定"</string>
     <string name="text_category">"文字設定"</string>
     <string name="phone_language">"選取地區"</string>
+    <!-- no translation found for phone_language_summary (1809580675831352352) -->
+    <skip />
     <string name="auto_replace">"自動取代"</string>
     <string name="auto_replace_summary">"修改不正確的字"</string>
     <string name="auto_caps">"自動大寫"</string>
     <string name="auto_caps_summary">"句子首字字母大寫"</string>
     <string name="auto_punctuate">"自動標點"</string>
+    <!-- no translation found for hardkeyboard_category (5957168411305769899) -->
+    <skip />
     <string name="auto_punctuate_summary">"按空白鍵兩次可插入「.」"</string>
     <string name="show_password">"密碼可見"</string>
     <string name="show_password_summary">"顯示輸入的密碼"</string>
@@ -690,4 +668,68 @@
     <string name="keep_screen_on_summary">"充電時螢幕不會進入休眠"</string>
     <string name="allow_mock_location">"允許模擬位置"</string>
     <string name="allow_mock_location_summary">"允許模擬位置"</string>
+    <!-- no translation found for battery_history_known_apps (6907374478255786240) -->
+    <skip />
+    <!-- no translation found for gadget_picker_title (4335873961457985189) -->
+    <skip />
+    <!-- no translation found for battery_history_details_for (5189636461798594740) -->
+    <skip />
+    <!-- no translation found for battery_history_uid (1016606150528436298) -->
+    <skip />
+    <!-- no translation found for battery_history_network_usage (8010852371665217020) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_received (980307569180518302) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_sent (2501748768602119159) -->
+    <skip />
+    <!-- no translation found for battery_history_bytes_total (4444807574361642753) -->
+    <skip />
+    <!-- no translation found for battery_history_cpu_usage (2597353713014790877) -->
+    <skip />
+    <!-- no translation found for battery_history_user_time (6227507614894791359) -->
+    <skip />
+    <!-- no translation found for battery_history_system_time (2015862072724507547) -->
+    <skip />
+    <!-- no translation found for battery_history_total_time (3618703970098556104) -->
+    <skip />
+    <!-- no translation found for battery_history_starts (9137453931978571696) -->
+    <skip />
+    <!-- no translation found for battery_history_days (6387593985264923377) -->
+    <skip />
+    <!-- no translation found for battery_history_hours (2593055276272350197) -->
+    <skip />
+    <!-- no translation found for battery_history_minutes (5608990219891318138) -->
+    <skip />
+    <!-- no translation found for battery_history_seconds (7397664460929461350) -->
+    <skip />
+    <!-- no translation found for battery_history_packages_sharing_this_uid (4101596071379250050) -->
+    <skip />
+    <!-- no translation found for battery_history_no_data (1177238743237067617) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor (2333488996028993982) -->
+    <skip />
+    <!-- no translation found for battery_history_used_by_packages (3000711380023436470) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage (3593133338613209024) -->
+    <skip />
+    <!-- no translation found for battery_history_sensor_usage_multi (4536084375991014508) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on (1377240025275657277) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_battery (536058210445081888) -->
+    <skip />
+    <!-- no translation found for battery_history_screen_on_plugged (5019127390021871260) -->
+    <skip />
+    <!-- no translation found for usage_stats_label (5890846333487083609) -->
+    <skip />
+    <!-- no translation found for testing_usage_stats (7823048598893937339) -->
+    <skip />
+    <!-- no translation found for display_order_text (8592776965827565271) -->
+    <skip />
+    <!-- no translation found for app_name_label (2000949925256858308) -->
+    <skip />
+    <!-- no translation found for launch_count_label (4019444833263957024) -->
+    <skip />
+    <!-- no translation found for usage_time_label (295954901452833058) -->
+    <skip />
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 0f0334c..7236353 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -143,4 +143,30 @@
         <item>2</item>
     </string-array>
 
+    <!-- Match with constants in BatteryHistory class -->
+    <string-array name="battery_history_type_spinner">
+        <item>CPU Usage</item>
+        <item>Network Usage</item>
+        <item>Sensor Usage</item>
+        <item>Screen On Time</item>
+<!--
+        <item>Wake Locks</item>
+-->
+    </string-array>
+
+    <!-- Match with constants in BatteryStats class -->
+    <string-array name="battery_history_which_spinner">
+        <item>Since device reset</item>
+        <item>Before last boot</item>
+        <item>Since last boot</item>
+        <item>Since last unplugged</item>
+    </string-array>
+
+    <!-- Display options for UsageStats class -->
+    <string-array name="usage_stats_display_order_types">
+        <item>Usage Time</item>
+        <item>Launch Count</item>
+        <item>Application Name</item>
+    </string-array>
+
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 199b4b4..a170c92 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -16,8 +16,5 @@
 
 <resources>
     <color name="black">#000</color>
-    <color name="white">#fff</color>
-    <color name="darker_gray">#aaa</color>
-    <color name="lighter_gray">#ddd</color>
 </resources>
          
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7daa165..862cc8b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -19,69 +19,6 @@
     <!-- Device Info --> <skip />
     <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
     <string name="device_info_default">Unknown</string>
-    <!-- Device Info screen. Status item label. How long the phone has been running since it was turned on -->
-    <string name="device_info_uptime">Uptime</string>
-    <!-- Device Info screen. Status item label. How long the main processor in the phone has been running -->
-    <string name="device_info_awaketime">Awake time</string>
-    <!-- Device Info screen. Status item label. How long the main processor in the phone has not been running -->
-    <string name="device_info_asleeptime">Asleep time</string>
-
-    <!-- Do not translate. Device Info screen. Status item label. The description of the software running on the phone. -->
-    <string name="build_description_label">Build description</string>
-    <!-- Do not translate. Device Info screen. Status item label. A short identifier of the software running on the phone. -->
-    <string name="build_id_label">Build ID</string>
-    <!-- Do not translate. Device Info screen. Status item label. The date that the software currently running on the phone was built. -->
-    <string name="build_date_label">Build date</string>
-    <!-- Do not translate. Device Info screen. Status item label. The type of configuration used while building the software -->
-    <string name="build_type_label">Build type</string>
-    <!-- Do not translate. Device Info screen. Status item label. The product type (probably a code name) -->
-    <string name="product_device_label">Phone type</string>
-    <!-- Do not translate. Device Info screen. Status item label. The product brand. -->
-    <string name="product_brand_label">Product brand</string>
-    <!-- Do not translate. Device Info screen. Status item label. The user that compiled/built the software -->
-    <string name="build_user_label">Build user</string>
-    <!-- Do not translate. Device Info screen. Status item label. The computer that compiled/built the software -->
-    <string name="build_host_label">Build host</string>
-    <!-- Do not translate. Device Info screen. Status item label. The version of the Linux kernel -->
-    <string name="kernel_version_label">Linux kernel version</string>
-    <!-- Do not translate. Device Info screen. Status item label. The version of the radio on the phone -->
-    <string name="gsm_version_baseband_label">Baseband version</string>
-    <!-- Do not translate. Device Info screen. Status item label. The version of the radio interface layer implementation -->
-    <string name="gsm_version_ril_impl_label">RIL Impl version</string>
-    <!-- Do not translate. Device Info screen. Status item label. The default keyboard's name -->
-    <string name="default_keyboard_device_label">Default keyboard device</string>
-    <!-- Do not translate. Device Info screen. Status item label. The Android ID (a unique ID) -->
-    <string name="android_id_label">Android ID</string>
-    <!-- Do not translate. Device Info screen. Status item label. The last time the device checked into the servers -->
-    <string name="checkin_last_time_label">Last successful checkin</string>
-    <!-- Do not translate. Device Info screen. Status item label. The number of failures since the last successful checkin -->
-    <string name="checkin_failures_label">Failures since last success</string>
-    <!-- Do not translate. Device Info screen. Status item label. Whether there is an upgrade pending -->
-    <string name="checkin_upgrade_label">Pending upgrade</string>
-    <!-- Do not translate. Device Info screen. Status item label. The download status of an upgrade -->
-    <string name="checkin_download_label">Download status</string>
-    <!-- Do not translate. Device Info screen. Status item label. Displayed for checkin_last_time_label if it has never checked in -->
-    <string name="checkin_time_never">(never)</string>
-    <!-- Do not translate. Device Info screen. Status item label. The current status of the checkin -->
-    <string name="checkin_status_label">Check-in status</string>
-    <!-- Do not translate. Device Info screen. Status item label. The request type of build to get upgrades from -->
-    <string name="target_build_field_label">Requested build type</string>
-    <!-- Do not translate. Device Info screen. Checks to see if an upgade is available -->
-    <string name="checkin_button_label">Check for upgrade</string>
-    <!-- Do not translate. Device Info screen. Message printed when a checkin has started -->
-    <string name="checkin_started_message">Checkin started\u2026</string>
-    <!-- Do not translate. Device Info screen. Status for checkin request when it is suspended -->
-    <string name="checkin_download_suspended">Suspended</string>
-    <!-- Do not translate. Device Info screen. Status for checkin request when it is pending -->
-    <string name="checkin_download_pending">Pending</string>
-    <!-- Do not translate. Device Info screen. Status for checkin request when it is downloading -->
-    <string name="checkin_download_ongoing">Downloading</string>
-    <!-- Do not translate. Device Info screen. Status for checkin request when it is unsuccessful -->
-    <string name="checkin_download_failed">Unsuccessful</string>
-    <!-- Do not translate. Device Info screen. Status for checkin request when it has completed -->
-    <string name="checkin_download_succeeded">Completed</string>
-    <!-- Do not translate. Device Info screen. Status for checkin request when it is unknown -->
-    <string name="checkin_download_unknown">Unknown status</string>
 
     <!-- Phone info -->
     <!-- Phone Info screen. Button label to turn on the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
@@ -158,6 +95,9 @@
     <!-- Used for diagnostic info screens, precise translation isn't needed. Unmounts the SD card from the phone, meaning it will become available for an attached computer  -->
     <string name="sdcard_unmount">Unmount SD card</string>
 
+    <!-- Used for diagnostic info screens, precise translation isn't needed. Formats the SD card in the phone, meaning it will be erased and reformatted -->
+    <string name="sdcard_format">Format SD card</string>
+
     <!-- choice for the font size spinner -->
     <string name="small_font">Small</string>
     <!-- choice for the font size spinner -->
@@ -173,13 +113,7 @@
     <!-- Title for a notification shown. -->
     <string name="sdcard_setting">SD card</string>
 
-    <!-- Label for when the screen will timeout. Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="screen_off_timeout_label">Never timeout while charging</string>
-    <!-- Checkbox for whether the screen will stay on when charging.This is in a hidden setting panel, so it's not too important  -->
-    <string name="stay_on">Screen is always on while charging</string>
 
-    <!-- Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="app_launcher_newView_text">New AppLauncher</string>
     <!-- Battery Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="battery_info_status_label">Battery status:</string>
     <!-- Battery Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -238,14 +172,6 @@
 
     <!-- Used as setting title (for checkbox) on second screen after selecting Bluetooth settings -->
     <string name="bluetooth">Bluetooth</string>
-    <!-- Summary text while Bluetooth is stopping -->
-    <string name="bluetooth_stopping">Bluetooth stopping\u2026</string>
-    <!-- Summary used for the Bluetooth on/off checkbox when bluetooth is currently disabled. -->
-    <string name="bluetooth_disabled">Turn on Bluetooth</string>
-    <!-- Summary used for the Bluetooth on/off checkbox when bluetooth is currently enabled. -->
-    <string name="bluetooth_enabled"></string>
-    <!-- Summary text while Bluetooth is turning on -->
-    <string name="bluetooth_enabling">Turning on Bluetooth\u2026</string>
     <!-- Bluetooth settings screen, check box label when the Bluetooth device can be seen by others -->
     <string name="bluetooth_visibility">Discoverable</string>
     <!-- Bluetooth settings screen,  summary after selecting Discoverable check box -->
@@ -260,8 +186,6 @@
     <string name="bluetooth_name_not_set">No name set, using account name</string>
     <!-- Bluetooth settings screen, menu item to scan for nearby bluetooth devices -->
     <string name="bluetooth_scan_for_devices">Scan for devices</string>
-    <!-- Bluetooth settings screen, menu item to clear the nearby bluetooth device list -->
-    <string name="bluetooth_clear_list">Clear device list</string>
     <!-- Bluetooth settings.  Message for disconnecting from a bluetooth device -->
     <string name="bluetooth_disconnect_blank"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected.</string>
     <!-- Bluetooth settings.  Message when cnonected to a device -->
@@ -276,28 +200,12 @@
     <string name="bluetooth_unknown"></string>
     <!--Bluetooth settings screen, summary text under individual Bluetooth devices when not paired yet -->
     <string name="bluetooth_not_connected">Pair with this device</string>
-    <!--Bluetooth settings screen, summary text when unable to turn on Bluetooth -->
-    <string name="bluetooth_failed_to_enable">Unable to turn on Bluetooth</string>
     <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
     <string name="bluetooth_pairing">Pairing\u2026</string>
-    <!--Bluetooth settings screen, summary text under individual Bluetooth devices when failure to pair with one -->
-    <string name="failed_to_pair">Unable to pair with <xliff:g id="device_name">%1$s</xliff:g>.</string>
-    <!--Bluetooth settings screen, summary text under individual Bluetooth devices when failure to connect with one-->
-    <string name="failed_to_connect">Unable to connect to <xliff:g id="device_name">%1$s</xliff:g>.</string>
     <!--Bluetooth settings screen, summary text under individual Bluetooth devices when paired with one -->
     <string name="bluetooth_paired">Paired</string>
-    <!--Bluetooth settings screen, summary text under individual Bluetooth devices when paired with one and the device is not nearby -->
-    <string name="bluetooth_paired_not_nearby">Paired</string>
     <!--Bluetooth settings screen, summary text under individual Bluetooth devices that are hands free or a headset -->
     <string name="bluetooth_device">handsfree/headset</string>
-    <!-- Context menu items for bluetooth device entries -->
-    <string name="bluetooth_disconnect">Disconnect</string>
-    <!-- Context menu items for bluetooth device entries -->
-    <string name="bluetooth_connect">Connect</string>
-    <!-- Context menu items for bluetooth device entries -->
-    <string name="bluetooth_unpair">Unpair</string>
-    <!-- Context menu items for bluetooth device entries -->
-    <string name="bluetooth_pair">Pair</string>
     <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
     <string name="progress_scanning">Scanning</string>
     <!-- Notification ticker text (shown in the status bar) when a Bluetooth device wants to pair with us -->
@@ -320,14 +228,8 @@
     <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
     <string name="bluetooth_device_info_deviceInfo_text"></string>
 
-    <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
-    <string name="bluetooth_sdp_query_services_text"></string>
     <!-- Date & time settings screen title -->
     <string name="date_and_time">Date &amp; time settings</string>
-    <!-- Do not translate. Sample date format -->
-    <string name="date_time_dateDisplay_text">Nov 3 1997</string>
-    <!-- Do not translate. Sample time format -->
-    <string name="date_time_timeDisplay_text">11:45 AM</string>
     <!-- Date/time settings.  Summary of the checkbox for choosing between 12 hour time or 24 hour time.  Sample of 12-hour time -->
     <string name="date_time_12_hour_sample">1:00 pm</string>
     <!-- Date/time settings.  Summary of the checkbox for choosing between 12 hour time or 24 hour time.  Sample of 24-hour time -->
@@ -336,10 +238,6 @@
     <string name="date_time_changeTime_text">Change time</string>
     <!-- Do not translate. Title to change date -->
     <string name="date_time_changeDate_text">Date</string>
-    <!-- Do not translate. Title to change time zone -->
-    <string name="date_time_setzone_text">Change time zone</string>
-    <!-- Do not translate. Label for current time zone -->
-    <string name="date_time_timezone_label">Time zone:</string>
     <!-- The title of the activity to pick a time zone. -->
     <string name="choose_timezone">Select time zone</string>
     <!-- Do not translate. Used as the value for a setting. -->
@@ -363,29 +261,6 @@
     <!-- Used for diagnostic screens, precise translation is not necessary -->
     <string name="intent_sender_account_label">Account: </string>
 
-    <!-- Setting title to choose a lock pattern -->
-    <string name="keyguard_pw_mod_text">Select lock pattern</string>
-    <!-- Setting title to change the PIN -->
-    <string name="keyguard_pin_mod_text">Change PIN</string>
-    <!-- Setting title for keyguard settings -->
-    <string name="keyguard_label">Keyguard</string>
-    <!-- Setting title for SIM PIN -->
-    <string name="keyguard_sim_pin_label">SIM PIN</string>
-
-    <!-- Error message when the password entered is incorrect -->
-    <string name="keyguard_password_old_password_error_text">The old password you typed is not correct. Please try again.</string>
-    <!-- Button text after they've entered passwords -->
-    <string name="keyguard_password_button_text">OK</string>
-    <!-- Label used for field to confirm the entered password -->
-    <string name="keyguard_password_confirm_new_label">Confirm new password:</string>
-    <!-- When changing password, the label for the new password -->
-    <string name="keyguard_password_new_label">New password:</string>
-    <!-- When changing password, the label for the Old password -->
-    <string name="keyguard_password_old_label">Old password:</string>
-    <!-- When changing password, the error message if the new password and the confirmatino don't match -->
-    <string name="keyguard_password_mismatch_error_text">The two passwords don\'t match. Please type them again.</string>
-
-
     <!-- HTTP proxy settings. Button to clear the proxy box. -->
     <string name="proxy_clear_text">Clear</string>
     <!-- HTTP proxy settings. The port number label. -->
@@ -471,6 +346,8 @@
     <string name="radio_info_smsc_update_label">Update</string>
     <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radio_info_smsc_refresh_label">Refresh</string>
+    <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radio_info_toggle_dns_check_label">Toggle DNS check</string>
 
     <!-- Band Mode Selection -->
     <!-- Band mode screen.  Title of activity. -->
@@ -484,15 +361,6 @@
     <!-- Band mode screen. Statusm essage when successful. -->
     <string name="band_mode_succeeded">Successful</string>
 
-    <!-- The label when choosing a ringer mode -->
-    <string name="ringer_volume_ringer_mode_label">Ringer mode</string>
-    <!-- The label for the 'increasing ring' checkbox setting -->
-    <string name="ringer_volume_screen_increasing_text">Increasing ring</string>
-    <!-- The label/title for the ringtone setting -->
-    <string name="ringer_volume_ringtone_label">Ringtone</string>
-    <!-- Instructions telling user hwo to adjust volume using the hardware volume keys -->
-    <string name="ringer_volume_instructions">Use volume buttons to adjust ringer volume</string>
-
     <!-- Instructions after the user changes the mass storage settings -->
     <string name="sdcard_changes_instructions">Changes take effect when USB cable is reconnected</string>
     <!-- Enable USB mass storage mode checkbox title -->
@@ -516,67 +384,6 @@
     <!-- Message when the SD card is mounted as read only -->
     <string name="sdcard_settings_read_only_status">SD card mounted read-only</string>
 
-    <!-- Title for dialog when SD card is removed unsafely -->
-    <string name="sdcard_removal_alert_title">Unsafe SD card removal!</string>
-
-    <!-- Error dialog's title when SD card is unreadable -->
-    <string name="sdcard_unmountable_alert_title">SD card unreadable</string>
-
-    <!-- Used by the APN editor. The label for user name to use. -->
-    <string name="telephony_user_label">User:</string>
-    <!-- Used by the APN editor. The label for server to use. -->
-    <string name="telephony_server_label">Server:</string>
-    <!-- Used by the APN editor. The label for the name of the APN. -->
-    <string name="telephony_name_label">Name:</string>
-    <!-- Used by the APN editor. The label for the MMSC. -->
-    <string name="telephony_mmsc_label">MMSC:</string>
-    <!-- Used by the APN editor. The label for the APN. -->
-    <string name="telephony_apn_label">APN:</string>
-    <!-- Used by the APN editor. The label for the MCC. -->
-    <string name="telephony_mcc_label">MCC:</string>
-    <!-- Used by the APN editor. The label for the port. -->
-    <string name="telephony_port_label">Port:</string>
-    <!-- Used by the APN editor. The label for the password. -->
-    <string name="telephony_password_label">Password:</string>
-    <!-- Used by the APN editor. The label for the proxy. -->
-    <string name="telephony_proxy_label">Proxy:</string>
-    <!-- Used by the APN editor. The label for the MNC. -->
-    <string name="telephony_mnc_label">MNC:</string>
-    <!-- Used by the APN editor. The label for the MMS proxy. -->
-    <string name="telephony_mmsproxy_label">MMS proxy:</string>
-    <!-- Used by the APN editor. The label for the MMS port. -->
-    <string name="telephony_mmsport_label">MMS port:</string>
-
-    <!-- Do not translate. (This is for unused legacy code)  Wi-Fi sample netmask -->
-    <string name="wifi_screen_netmask_text">255.255.255.0</string>
-    <!-- Do not translate. (This is for unused legacy code)  Wi-Fi busy text -->
-    <string name="wifi_screen_status_text">Wi-Fi is working</string>
-    <!-- Do not translate. (This is for unused legacy code)  Wi-Fi sample DNS -->
-    <string name="wifi_screen_dns_text">209.81.59.2</string>
-    <!-- Do not translate. (This is for unused legacy code)  Wi-Fi sample gateway -->
-    <string name="wifi_screen_gateway_text">192.168.20.1</string>
-    <!-- Do not translate. (This is for unused legacy code)  Translatoin not needed -->
-    <string name="wifi_screen_test_text">Test</string>
-    <!-- Do not translate. (This is for unused legacy code)  Wi-Fi label for gateway -->
-    <string name="wifi_gateway_label">gateway:</string>
-    <!-- Do not translate. (This is for unused legacy code)  Wi-Fi label for netmask -->
-    <string name="wifi_netmask_label">netmask:</string>
-    <!-- Do not translate. (This is for unused legacy code)  Wi-Fi label DHCP -->
-    <string name="wifi_screen_dhcp_text">automatic</string>
-    <!-- Do not translate. (This is for unused legacy code)  Wi-Fi label for host IP -->
-    <string name="wifi_host_ip">host ip:</string>
-    <!-- Do not translate. (This is for unused legacy code)  Wi-Fi label for choosing a wifi access point -->
-    <string name="wifi_screen_activate_text">Activate</string>
-    <!-- Do not translate. (This is for unused legacy code)  Wi-Fi label for ID -->
-    <string name="wifi_wlan_id">wlan id:</string>
-    <!-- Do not translate. (This is for unused legacy code)  Wi-Fi sample IP -->
-    <string name="wifi_screen_ip_text">192.168.20.10</string>
-    <!-- Do not translate. (This is for unused legacy code)  Wi-Fi code for manually entered info -->
-    <string name="wifi_screen_manual_text">manual</string>
-    <!-- Do not translate. (This is for unused legacy code)  Wi-Fi label for DNS -->
-    <string name="wifi_dns_label">dns:</string>
-
-
     <!-- SetupWizard strings used by DateTimeSettingsSetupWizard.  The button label for going to the next screen. -->
     <string name="next_label">Next</string>
 
@@ -586,12 +393,6 @@
     <!-- Locale picker screen. Label for choosing the locale -->
     <string name="select_your_language">Select your language</string>
 
-    <!--  TODO: 881807 -->
-    <!-- Do not translate. Settings chooser, does not need to be translated -->
-    <string name="settings_chooser_pick_string">
-        Settings icon should forward to:
-    </string>
-
     <!-- The title of the dialog to pick an activity.  This is shown when there are multiple activities that can do a particular action.  For example, suppose you click on the "Share" menu item in the Browser.  Since you can share the webpage URL via many communication methods, this dialog would come up with choices like "Email", "IM", etc.  This is a generic message, and the previous example is a single possible scenario (so please don't assume it's for the browser or anything :) ). -->
     <string name="activity_picker_label">Select activity</string>
     <!-- Do not translate. -->
@@ -683,8 +484,6 @@
     <string name="bluetooth_pin_entry">Bluetooth pairing request</string>
     <!-- Title for the bluetooth device info screen. -->
     <string name="bluetooth_device_info">Bluetooth device info</string>
-    <!-- Message when the bluetooth is pairing with anotehr device -->
-    <string name="bluetooth_pairing_msg">Pairing\u2026</string>
     <!-- Message when bluetooth dialog for pin entry is shwoing -->
     <string name="bluetooth_enter_pin_msg"><xliff:g id="device_name">%1$s</xliff:g>\n\nType PIN to pair.\n(Try 0000 or 1234.)</string>
 
@@ -692,23 +491,12 @@
     <string name="bluetooth_error_title">Attention</string>
     <!-- Message for the error dialog when BT pairing fails generically. -->
     <string name="bluetooth_pairing_error_message">There was a problem pairing with <xliff:g id="device_name">%1$s</xliff:g>.</string> 
-    <!-- Alternative message for the error dialog when BT pairing fails generically. This message suggests the user to try another PIN. -->
-    <string name="bluetooth_pairing_alternate_error_message">There was a problem pairing with <xliff:g id="device_name">%1$s</xliff:g>. Please try another PIN.</string> 
     <!-- Message for the error dialog when BT pairing fails because the PIN entered is incorrect. -->
     <string name="bluetooth_pairing_pin_error_message">There was a problem pairing with <xliff:g id="device_name">%1$s</xliff:g> because the typed PIN is incorrect.</string> 
-    
+
     <!-- Message for the error dialog when BT connecting operation fails generically. -->
     <string name="bluetooth_connecting_error_message">There was a problem connecting to <xliff:g id="device_name">%1$s</xliff:g>.</string> 
 
-    <!-- Bluetooth title for entering new data -->
-    <string name="bluetooth_new_data">Type new data</string>
-    <!-- Bluetooth button for confirming new data-->
-    <string name="bluetooth_new_data_confirm">OK</string>
-    <!-- Bluetooth button for canceling new data-->
-    <string name="bluetooth_new_data_cancel">Cancel</string>
-
-    <!-- Bluetooth message when scanning for new devices -->
-    <string name="bluetooth_scan_for_new_devices">Scanning for new devices\u2026</string>
     <!-- Do not translate -->
     <string name="bluetooth_device_info_alias">Device alias</string>
     <!-- Do not translate -->
@@ -718,18 +506,8 @@
     <!-- Do not translate -->
     <string name="bluetooth_device_info_sdp">List supported services</string>
 
-    <!-- Caption for bluetooth discoverability setting dialog. -->
-    <string name="bluetooth_discoverability_panel_title">Make me\u2026</string>
-    <!-- Summary for discoverable setting when device is discoverable for some amount of time -->
-    <string name="bluetooth_discoverable">Discoverable for <xliff:g id="discoverable_time_period">%1$s</xliff:g> seconds</string>
-    <!-- Summary for discoverable setting when device is connectable -->
-    <string name="bluetooth_connectable">Connectable only</string>
-    <!-- Summary for discoverable setting when device is not discoverable or conenctable -->
-    <string name="bluetooth_neither">Neither discoverable nor connectable</string>
     <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
     <string name="bluetooth_preference_scan_title">Scan for devices</string>
-    <!-- Bluetooth settings: The summary of the preference (list item) that initiates a scan for devices -->
-    <string name="bluetooth_preference_scan_summary">Find devices to pair with</string>
     
     <!-- Bluetooth settings.  Context menu item for a device.  Action will connect to all profiles on the device. -->
     <string name="bluetooth_device_context_connect">Connect</string>
@@ -1018,47 +796,17 @@
     <string name="sound_effects_enable_summary_on">Play sound when making screen selection</string>
     <!-- Sound settings screen, setting option summary text when check box is clear -->
     <string name="sound_effects_enable_summary_off">Play sound when making screen selection</string>
+    <!-- Sound settings screen, setting check box label -->
+    <string name="play_media_notification_sounds_enable_title">SD card notifications</string>
+    <!-- Sound settings screen, setting option summary text when check box is selected -->
+    <string name="play_media_notification_sounds_enable_summary_on">Disable SD card notification sounds</string>
+    <!-- Sound settings screen, setting option summary text when check box is clear -->
+    <string name="play_media_notification_sounds_enable_summary_off">Enable SD card notification sounds</string>
 
-    <!-- Sync settings -->
     <!-- Main Settings screen setting option name to go into the screen for data sync settings-->
     <string name="sync_settings">Data synchronization</string>
     <!-- Main Settings screen setting option summary text for the itme to go into the screen with data sync settings-->
     <string name="sync_settings_summary">Select which applications are synchronized</string>
-    <!-- Data synchronization settings screen, the header title for the settings that are general, for example background data on/off. -->
-    <string name="sync_settings_header_general_settings">General sync settings</string>
-    <!-- Data synchronization settings screen, the header title for the settings that are application-specific. -->
-    <string name="sync_settings_header_application_settings">Application sync settings</string>
-    <!-- Error message when the sync tried to delete too many things -->
-    <string name="sync_too_many_deletes">Delete limit exceeded</string>
-    <!-- Data synchronization settings screen, setting option name -->
-    <string name="sync_automatically">Auto-sync</string>
-    <!-- Data synchronization settings screen, setting option summary text when check box is selected -->
-    <string name="sync_enabled">Automatically sync data</string>
-    <!-- Data synchronization settings screen, setting option summary text when check box is clear -->
-    <string name="sync_disabled">Select to automatically sync data</string>
-    <!-- Data synchronization settings screen, menu option -->
-    <string name="sync_menu_sync_now">Sync now</string>
-    <!-- Data synchronization settings screen, menu option -->
-    <string name="sync_menu_sync_cancel">Cancel sync</string>
-    <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Gmail should be synced. -->
-    <string name="sync_gmail">Gmail</string>
-    <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Calendar shoudl be synced. -->
-    <string name="sync_calendar">Calendar</string>
-    <!-- Data synchronization settings screen, checkbox setting option name -->
-    <string name="sync_contacts">Contacts</string>
-    <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
-    <string name="sync_too_many_deletes_desc">There are <xliff:g id="number_of_deleted_items">%1$d</xliff:g> deleted items for <xliff:g id="type_of_sync">%2$s</xliff:g>, account <xliff:g id="account_name">%3$s</xliff:g>. What would you like to do?</string>
-    <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
-    <string name="sync_really_delete">Delete the items.</string>
-    <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
-    <string name="sync_undo_deletes">Undo the deletes.</string>
-    <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
-    <string name="sync_do_nothing">Do nothing for now.</string>
-    <!-- Message when sync is currently failing -->
-    <string name="sync_is_failing">Sync is currently experiencing problems. It will be back shortly.</string>
-    <string name="sync_plug"><font fgcolor="#ffffffff">Welcome to Google Sync!</font>
-    \nA Google approach to synchronizing data to allow access to your contacts, appointments and more from wherever you are.
-    </string>
 
     <!-- Display settings -->
     <!-- Sound & display settings screen, section header for settings related to display -->
@@ -1071,10 +819,12 @@
     <string name="animations_summary_off">Show animation when opening/closing windows</string>
     <!-- Sound & display settings screen, setting option name to change brightness -->
     <string name="brightness">Brightness</string>
-    <!-- Sound & display settings screen, setting option name to chagne screen timeout -->
+    <!-- Sound & display settings screen, setting option summary to change brightness -->
+    <string name="brightness_summary">Adjust the brightness of the screen</string>
+    <!-- Sound & display settings screen, setting option name to change screen timeout -->
     <string name="screen_timeout">Screen timeout</string>
-    <!-- Sound & display settings screen, setting option name to change whether the screen dims automatically before it is about to turn off -->
-    <string name="dim_screen">Dim screen</string>
+    <!-- Sound & display settings screen, setting option summary to change screen timeout -->
+    <string name="screen_timeout_summary">Adjust the delay before the screen automatically turns off</string>
 
     <!-- SIM lock settings title -->
     <string name="sim_lock_settings">SIM card lock settings</string>
@@ -1175,6 +925,10 @@
     <string name="status_bt_address">Bluetooth address</string>
     <!-- About phone, status item value if the actual value is not available. -->
     <string name="status_unavailable">Unavailable</string>
+    <!-- About phone, status item title.  How many packets and bytes have been sent and received across all network interfaces. -->
+    <string name="status_network_traffic_stats">Network usage</string>
+    <!-- About phone, status item summary.  How many packets and bytes have been sent and received across all network interfaces. -->
+    <string name="status_network_traffic_summary">Sent: <xliff:g id="network_traffic">%1$d packets, %2$d bytes%n</xliff:g>Rcvd: <xliff:g id="network_traffic">%3$d packets, %4$d bytes</xliff:g></string>
     <!-- About phone, status item title.  How long the device has been running since its last reboot. -->
     <string name="status_up_time">Up time</string>
     <!-- About phone, status item title.  How much time the device has had its main CPU awake. -->
@@ -1188,7 +942,13 @@
     <!-- SD card & phone storage settings screen heading.  The total amount of storage space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section -->
     <string name="memory_size">Total space</string>
     <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
-    <string name="sd_eject">Unmount/eject SD card</string>
+    <string name="sd_eject">Unmount SD card</string>
+    <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
+    <string name="sd_eject_summary">Unmount the SD card for safe removal</string>
+    <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   -->
+    <string name="sd_format">Format SD card</string>
+    <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   -->
+    <string name="sd_format_summary">Format (erase) the SD card</string>
     <!-- SD card status when it is not available status -->
     <string name="sd_unavailable">Unavailable</string>
     <!-- SD card status when it is mounted as read only  -->
@@ -1270,6 +1030,24 @@
     <!-- Master clear failed message -->
     <string name="master_clear_failed">No reset was performed because the System Clear service is not available.</string>
 
+    <!-- Media Format -->
+    <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading -->
+    <string name="media_format_title">Format SD card.</string>
+    <!-- SD card & phone storage settings screen, setting option summary text under Internal phone storage heading -->
+    <string name="media_format_summary">Erases all data on the SD card</string>
+    <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset -->
+    <string name="media_format_desc">This action will erase the SD card in the phone. You will lose ALL data on the card!</string>
+    <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
+    <string name="media_format_button_text">Format SD card</string>
+    <!-- SD card & phone storage settings screen, message on screen after user selects Format media button -->
+    <string name="media_format_final_desc">Format SD card, erasing all your media? Action cannot be reversed!</string>
+    <!-- SD card & phone storage settings screen, button on screen after user selects Format media button -->
+    <string name="media_format_final_button_text">Erase everything</string>
+    <!-- Message to draw an unlock pattern before clearing the device -->
+    <string name="media_format_gesture_prompt">Draw your unlock pattern</string>
+    <!-- Explanation of drawing unlock pattern to format card -->
+    <string name="media_format_gesture_explanation">You must draw your unlock pattern to confirm an SD card format.</string>
+
     <!-- Main settings screen, Call settings title for item to go into the call settings -->
     <string name="call_settings_title">Call settings</string>
     <!-- Main settings screen, Call settings summary for item to go into call settings -->
@@ -1294,10 +1072,6 @@
     <string name="location_street_level">When locating, accurate to street level (deselect to conserve battery)</string>
     <!-- Security & location settings screen, setting summary when Enable GPS satellites check box is clear -->
     <string name="location_gps_disabled">Locate to street-level (requires more battery plus view of sky)</string>
-    <!-- Do not translate. -->
-    <string name="location_label">Location provider:</string>
-    <!-- Do not translate. -->
-    <string name="location_status">Status:</string>
 
     <!-- About -->
     <!-- Main settings screen, setting title for the user to go into the About phone screen -->
@@ -1408,6 +1182,8 @@
     <!-- Applications Settings --> <skip />
     <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
     <string name="manageapplications_settings_title">Manage applications</string>
+    <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
+    <string name="manageapplications_settings_summary">Manage and remove installed applications</string>
     <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
     <string name="applications_settings">Applications</string>
     <!-- Applications settings summary, on main settings screen. The summary for the "Applications" item on the main settings screen. Describes what settings are accessible from the "Applications" screen. -->
@@ -1423,8 +1199,6 @@
  from unknown sources. You agree that you are solely responsible for any
  damage to your phone or loss of data that may result from using
  these applications.</string>
-    <!-- Manage applications settings screen, screen title. This screen is for managing installed apps, and is a list of apps. -->
-    <string name="manage_applications_title">Manage applications</string>
     <!-- Manage applications, individual application info screen title. For example, if they click on "Browser" in "Manage applications", the title of the next screen will be this -->
     <string name="application_info_label">Application info</string>
     <!-- Manage applications, individual application info screen, section heading for stuff relating to an app's storage settings. -->
@@ -1433,6 +1207,16 @@
     <string name="auto_launch_label">Launch by default</string>
     <!-- Manage applications, individual application info screen, heading for settings related to the app's permissions. for example, it may list all the permissions the app has. -->
     <string name="permissions_label">Permissions</string>
+    <!-- Manage applications, Header name used for cache information -->
+    <string name="cache_header_label">Cache</string>
+    <!-- Manage applications, text label for button -->
+    <string name="clear_cache_btn_text">Clear cache</string>
+    <!-- Manage applications, label that appears next to the cache size -->
+    <string name="cache_size_label">Cache</string>
+    <!-- Manage applications, Header name used for other controls -->
+    <string name="controls_label">Controls</string>
+    <!-- Manage applications, text label for button to kill / force stop an application -->
+    <string name="force_stop">Force stop</string>
     <!-- Manage applications, individual application info screen,label under Storage heading.  The total storage space taken up by this app. -->
     <string name="total_size_label">Total</string>
     <!-- Manage applications, individual application info screen, label under Storage heading. The amount of space taken up by the application itself (for example, the java compield files and things like that) -->
@@ -1457,13 +1241,17 @@
     <string name="sort_order_size">Sort by size</string>
     <!-- Manage applications screen, individual app screen, button label when the user wants to manage the space taken up by an app. -->
     <string name="manage_space_text">Manage space</string>
-    <!-- Text for menu option in ManageApps screen to display all installed
+    <!-- Text for menu option in ManageApps screen to present various menu options -->
+    <string name="filter">Filter</string>
+    <!-- Title of dialog for presenting filter options -->
+    <string name="filter_dlg_title">Select filter options</string>
+    <!-- Text for filter option in ManageApps screen to display all installed
     applications -->
     <string name="filter_apps_all">All</string>
-    <!-- Text for menu option in ManageApps screen to display third party 
+    <!-- Text for filter option in ManageApps screen to display third party 
     applications only -->
     <string name="filter_apps_third_party">Third-party</string>
-    <!-- Text for menu option in ManageApps screen to display list of running
+    <!-- Text for filter option in ManageApps screen to display list of running
     packages only. -->
     <string name="filter_apps_running">Running</string>
     <string name="loading">Loading\u2026</string>
@@ -1486,16 +1274,10 @@ found in the list of installed applications.</string>
     <string name="clear_data_failed">Unable to clear application data.</string>
     <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
     <string name="security_settings_desc">This application can access the following on your phone:</string>
-    <string name="computing_size">Still computing\u2026</string>
+    <string name="computing_size">Computing\u2026</string>
     <string name="invalid_size_value">Unable to compute package size</string>
     <!-- String displayed when list is empty -->
     <string name="empty_list_msg">You do not have any third-party apps installed.</string>
-    <!-- Manage applications, Header name used for cache information -->
-    <string name="cache_header_label">Cache</string>
-    <!-- Manage applications, text label for button -->
-    <string name="clear_cache_btn_text">Clear cache</string>
-    <!-- Manage applications, label that appears next to the cache size -->
-    <string name="cache_size_label">Cache</string>
 
     <!-- Language Settings --> <skip />
     <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
@@ -1508,6 +1290,8 @@ found in the list of installed applications.</string>
     <string name="text_category">Text settings</string>
     <!-- On Text & language settings screen, setting option name. title of the setting to take the user to a screen to select the locale. -->
     <string name="phone_language">Select locale</string>
+    <!-- On Text & language settings screen, setting option name. summary of the setting to take the user to a screen to select the locale. -->
+    <string name="phone_language_summary">Select language and region</string>
     <!-- On Text & language settings screen, setting option name. title of the setting to enable autoreplace of entered text. auto replace is a feature that will automatically correct mistyped words. -->
     <string name="auto_replace">Auto-replace</string>
     <!-- On Text & language settings screen, setting summary.  This is the summary for the "Auto-replace" setting. -->
@@ -1518,6 +1302,8 @@ found in the list of installed applications.</string>
     <string name="auto_caps_summary">Capitalize first letter in sentences</string>
     <!-- On Text & language settings screen, setting option name. title of the setting to enable automatic punctuation of entered text.  for example, it will change an entered "youre" to "you're". -->
     <string name="auto_punctuate">Auto-punctuate</string>
+    <!-- On Text & language settings screen, category for physical keyboard text entry options. -->
+    <string name="hardkeyboard_category">Physical keyboard settings</string>
     <!-- On Text & language settings screen, setting summary for the Auto-punctuate setting. -->
     <string name="auto_punctuate_summary">Press Space key twice to insert \u0022.\u0022</string>
     <!-- On Security & location settings screen, setting check box name. Title of the checkbox to set whether password edit fields will show the most recent character typed and then hide it, or just hide it right away.  By hide, I mean mask it out. -->
@@ -1600,4 +1386,95 @@ found in the list of installed applications.</string>
     <!-- setting Checkbox summary whether to allow mock locations  -->
     <string name="allow_mock_location_summary">Allow mock locations</string>
 
+    <!-- List of application labels to be used to represent shared UIDs -->
+    <string name="battery_history_known_apps">Android System;Dialer;Calendar;Camera;Google Apps;Contacts;</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) -->
+    <string name="gadget_picker_title">Choose Gadget</string>
+
+    <!-- Used to display "Details for UID 1234" in BatteryHistory -->
+    <string name="battery_history_details_for">Details for UID %d</string>
+
+    <!-- Used to name a set of apps that share a user id in BatteryHistory -->
+    <string name="battery_history_uid">UID <xliff:g id="user_id">%1$d</xliff:g></string>
+
+    <!-- Used as a title for the network usage details screen in BatteryHistory -->
+    <string name="battery_history_network_usage">Network usage details for <xliff:g id="app_name">%1$s</xliff:g>:</string>
+
+    <!-- Used to show the number of bytes received by an app over the network in BatteryHistory -->
+    <string name="battery_history_bytes_received">Bytes received: <xliff:g id="bytes">%1$d</xliff:g></string>
+
+    <!-- Used to show the number of bytes sent by an app over the network in BatteryHistory -->
+    <string name="battery_history_bytes_sent">Bytes sent: <xliff:g id="bytes">%1$d</xliff:g></string>
+
+    <!-- Used to show the number of bytes sent and received by an app over the network in BatteryHistory -->
+    <string name="battery_history_bytes_total">Total bytes: <xliff:g id="bytes">%1$d</xliff:g></string>
+
+    <!-- Used as a title for the cpu usage details screen in BatteryHistory -->
+    <string name="battery_history_cpu_usage">CPU usage details for <xliff:g id="app_name">%1$s</xliff:g>:</string>
+
+    <!-- Used to show the time spent in user code for a given app in BatteryHistory -->
+    <string name="battery_history_user_time">User time: </string>
+
+    <!-- Used to show the time spent in system code for a given app in BatteryHistory -->
+    <string name="battery_history_system_time">System time: </string>
+
+    <!-- Used to show the time spent in user or system code for a given app in BatteryHistory -->
+    <string name="battery_history_total_time">Total time: </string>
+
+    <!-- Used to show the number of times an app has been started in BatteryHistory -->
+    <string name="battery_history_starts">Starts: <xliff:g id="starts">%1$d</xliff:g></string>
+
+    <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
+    <string name="battery_history_days"><xliff:g id="days">%1$d</xliff:g> days, <xliff:g id="hours">%2$d</xliff:g> hours, <xliff:g id="minutes">%3$d</xliff:g> minutes, <xliff:g id="seconds">%4$d</xliff:g> seconds</string>
+
+    <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
+    <string name="battery_history_hours"><xliff:g id="hours">%1$d</xliff:g> hours, <xliff:g id="minutes">%2$d</xliff:g> minutes, <xliff:g id="seconds">%3$d</xliff:g> seconds</string>
+
+    <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
+    <string name="battery_history_minutes"><xliff:g id="minutes">%1$d</xliff:g> minutes, <xliff:g id="seconds">%2$d</xliff:g> seconds</string>
+
+    <!-- Used to show an amount of time in the form "s seconds" in BatteryHistory -->
+    <string name="battery_history_seconds"><xliff:g id="seconds">%1$d</xliff:g> seconds</string>
+
+    <!-- Used to head a list of packages that share a given user id BatteryHistory -->
+    <string name="battery_history_packages_sharing_this_uid">Packages sharing this UID:</string>
+    
+    <!-- Used when no battery data available in BatteryHistory -->
+    <string name="battery_history_no_data">No battery usage data available</string>
+        
+    <!-- Used for Sensor detail screen in BatteryHistory -->
+    <string name="battery_history_sensor">Sensor:</string>
+    
+    <!-- Used for Sensor detail screen in BatteryHistory -->
+    <string name="battery_history_used_by_packages">Sensor used by packages:</string>
+    
+    <!-- Used for Sensor detail screen in BatteryHistory -->
+    <string name="battery_history_sensor_usage">Used <xliff:g id="count">%1$d</xliff:g> times by <xliff:g id="package">%2$s</xliff:g></string>
+    
+    <!-- Used for Sensor detail screen in BatteryHistory -->
+    <string name="battery_history_sensor_usage_multi">Used <xliff:g id="count">%1$d</xliff:g> times by one of:</string>
+    
+    <!-- Used for Screen on time message in BatteryHistory -->
+    <string name="battery_history_screen_on">Time spent with screen on:</string>
+    
+    <!-- Used for Screen on time message in BatteryHistory -->
+    <string name="battery_history_screen_on_battery">On battery:</string>
+    
+    <!-- Used for Screen on time message in BatteryHistory -->
+    <string name="battery_history_screen_on_plugged">Plugged in:</string>
+
+    <!-- Strings used for displaying usage statistics -->
+    <string name="usage_stats_label">Usage statistics</string>
+    <!-- In the Testing screen. The item title of the activity that shows usage statistics.  -->
+    <string name="testing_usage_stats">Usage statistics</string>
+    <!-- label for text to indicate sort options -->
+    <string name="display_order_text">Sort by:</string>
+    <!-- label for application name -->
+    <string name="app_name_label">Application</string>
+    <!-- label for launch count -->
+    <string name="launch_count_label">Count</string>
+    <!-- label for usage time -->
+    <string name="usage_time_label">Usage time</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 88a991f..33e43bb 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -54,28 +54,11 @@
         <item name="android:layout_height">wrap_content</item>
     </style>
     
-	<style name="form_label">
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_width">fill_parent</item>
-        <item name="android:textAppearance">@style/TextAppearance.form_label</item>
-    </style>
-
     <style name="form_value">
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">fill_parent</item>
     </style>
 
-    <style name="form_layout">
-        <item name="android:orientation">vertical</item>
-        <item name="android:paddingLeft">10dip</item>
-        <item name="android:paddingTop">0dip</item>
-        <item name="android:paddingRight">10dip</item>
-        <item name="android:paddingBottom">0dip</item>
-        <item name="android:layout_width">fill_parent</item>
-        <item name="android:layout_height">fill_parent</item>
-    </style>
-    
-    
 
     <style name="TextAppearance" parent="android:TextAppearance">
     </style>
@@ -85,10 +68,6 @@
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="TextAppearance.form_label">
-        <item name="android:textStyle">bold</item>
-    </style>
-
     <style name="TextAppearance.info_small">
         <item name="android:textSize">12sp</item>
         <item name="android:textStyle">normal</item>
@@ -98,15 +77,5 @@
         <item name="android:textSize">14sp</item>
         <item name="android:textStyle">normal</item>
     </style>
-   <style name="SubCategoryHeader">
-       <item name="android:background">@*android:drawable/title_bar</item>
-       <item name="android:singleLine">true</item>
-        <item name="android:textAppearance">@style/android:TextAppearance.WindowTitle</item>
-        <item name="android:shadowColor">#BB000000</item>
-        <item name="android:shadowRadius">2.75</item>
-        <item name="android:paddingBottom">3dip</item>
-        <item name="android:paddingTop">3dip</item>
-        <item name="android:paddingLeft">4dip</item>
-   </style> 
 
 </resources>
diff --git a/res/xml/apn_editor.xml b/res/xml/apn_editor.xml
index 1ba01c5..34029d1 100644
--- a/res/xml/apn_editor.xml
+++ b/res/xml/apn_editor.xml
@@ -15,8 +15,8 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    <PreferenceCategory android:title="@string/apn_edit"/>
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="@string/apn_edit">
     <EditTextPreference
         android:title="@string/apn_name"
         android:dialogTitle="@string/apn_name"
@@ -52,7 +52,6 @@
         android:dialogTitle="@string/apn_password"
         android:key="apn_password"
         android:singleLine="true"
-        android:password="true"
         />
     <EditTextPreference
         android:title="@string/apn_server"
diff --git a/res/xml/apn_settings.xml b/res/xml/apn_settings.xml
index abf268b..86a336c 100644
--- a/res/xml/apn_settings.xml
+++ b/res/xml/apn_settings.xml
@@ -15,6 +15,6 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    <PreferenceCategory android:title="@string/apn_settings" android:key="apn_list"/>
-</PreferenceScreen>   
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="@string/apn_settings" android:key="apn_list">
+</PreferenceScreen>
diff --git a/res/xml/application_settings.xml b/res/xml/application_settings.xml
index c4f2bd0..8d0a7cb 100644
--- a/res/xml/application_settings.xml
+++ b/res/xml/application_settings.xml
@@ -15,13 +15,10 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/applications_settings"
+        android:title="@string/applications_settings_header"
         android:summary="@string/applications_settings_summary"
         android:key="applications_settings">
 
-    <PreferenceCategory
-            android:title="@string/applications_settings_header"/>
-        
     <CheckBoxPreference
             android:key="toggle_install_applications"
             android:title="@string/install_applications"
@@ -39,7 +36,8 @@
     </PreferenceScreen>
         
     <PreferenceScreen
-            android:title="@string/manage_applications_title">
+            android:title="@string/manageapplications_settings_title"
+            android:summary="@string/manageapplications_settings_summary">
         <intent android:action="android.intent.action.MAIN"
                 android:targetPackage="com.android.settings"
                 android:targetClass="com.android.settings.ManageApplications" />
diff --git a/res/xml/bluetooth_settings.xml b/res/xml/bluetooth_settings.xml
index 8449343..131f7a0 100644
--- a/res/xml/bluetooth_settings.xml
+++ b/res/xml/bluetooth_settings.xml
@@ -15,10 +15,8 @@
 -->
 
 <PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <PreferenceCategory
-        android:title="@string/bluetooth_settings" />
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/bluetooth_settings" >
 
     <CheckBoxPreference
         android:key="bt_checkbox"
diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml
index 47e047a..5e696de 100644
--- a/res/xml/date_time_prefs.xml
+++ b/res/xml/date_time_prefs.xml
@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/date_and_time"/>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/date_and_time">
     <CheckBoxPreference android:key="auto_time" 
         android:title="@string/date_time_auto"
         android:summaryOn="@string/date_time_auto_summaryOn"
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 286497e..77c100a 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -14,10 +14,8 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <PreferenceCategory
-        android:title="@string/development_settings_title"/>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/development_settings_title">
         
     <CheckBoxPreference 
         android:key="enable_adb" 
diff --git a/res/xml/device_info_memory.xml b/res/xml/device_info_memory.xml
index 0d90b95..b7ec3c1 100644
--- a/res/xml/device_info_memory.xml
+++ b/res/xml/device_info_memory.xml
@@ -26,7 +26,11 @@
             android:title="@string/memory_available"
             android:summary="00"/>
         <Preference android:key="memory_sd_unmount"
-            android:title="@string/sd_eject"/>
+            android:title="@string/sd_eject"
+            android:summary="@string/sd_eject_summary"/>
+        <Preference android:key="memory_sd_format"
+            android:title="@string/sd_format"
+            android:summary="@string/sd_format_summary"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/internal_memory">
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 07716da..205e588 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/about_settings">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/about_settings">
 
         <!-- System update settings - launches activity -->
         <PreferenceScreen android:key="system_update_settings"
@@ -105,7 +105,5 @@
                 style="?android:preferenceInformationStyle"
                 android:title="@string/build_number"
                 android:summary="@string/device_info_default"/>
-                
-    </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/device_info_status.xml b/res/xml/device_info_status.xml
index 3e3be55..4c01690 100644
--- a/res/xml/device_info_status.xml
+++ b/res/xml/device_info_status.xml
@@ -14,9 +14,9 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/device_status_activity_title"/>
-    
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/device_status_activity_title">
+
     <Preference android:key="battery_status" 
         style="?android:attr/preferenceInformationStyle" 
         android:title="@string/battery_status_title"
@@ -87,6 +87,11 @@
         android:title="@string/status_bt_address"
         android:summary="@string/device_info_not_available"
         android:persistent="false" />
+    <Preference android:key="network_traffic_stats"
+        style="?android:attr/preferenceInformationStyle" 
+        android:title="@string/status_network_traffic_stats"
+        android:summary="@string/device_info_not_available"
+        android:persistent="false" />
     <Preference android:key="up_time"
         style="?android:attr/preferenceInformationStyle" 
         android:title="@string/status_up_time"
diff --git a/res/xml/input_methods_prefs.xml b/res/xml/input_methods_prefs.xml
index b8a415f..9a4f527 100644
--- a/res/xml/input_methods_prefs.xml
+++ b/res/xml/input_methods_prefs.xml
@@ -16,8 +16,7 @@
  * limitations under the License.
  */
 -->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory
-        android:title="@string/input_methods_settings_title" />
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/input_methods_settings_title">
 
 </PreferenceScreen>
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index ff123ed..2927540 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -15,24 +15,17 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    
-    <PreferenceCategory
-            android:key="language_category"
-            android:title="@string/language_category">
-     <!--
-        <ListPreference
-            android:title="@string/phone_language"/>
-      --> 
-            
-        <PreferenceScreen
-                android:title="@string/phone_language">
-            <intent android:action="android.intent.action.MAIN"
-                    android:targetPackage="com.android.settings"
-                    android:targetClass="com.android.settings.LocalePicker"/>
-        </PreferenceScreen>
-    </PreferenceCategory>
-    
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="@string/language_settings">
+
+    <PreferenceScreen
+            android:title="@string/phone_language"
+            android:summary="@string/phone_language_summary">
+        <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.LocalePicker"/>
+    </PreferenceScreen>
+
     <PreferenceCategory
             android:title="@string/text_category" />
     <PreferenceScreen 
@@ -49,22 +42,26 @@
                 android:targetPackage="com.android.settings"
                 android:targetClass="com.android.settings.UserDictionarySettings" />
     </PreferenceScreen>
-    <CheckBoxPreference
-            android:key="auto_replace"
-            android:title="@string/auto_replace"
-            android:summaryOn="@string/auto_replace_summary"
-            android:summaryOff="@string/auto_replace_summary"
-            android:persistent="false"/>
-    <CheckBoxPreference
-            android:key="auto_caps"
-            android:title="@string/auto_caps"
-            android:summaryOn="@string/auto_caps_summary"
-            android:summaryOff="@string/auto_caps_summary"
-            android:persistent="false"/>
-    <CheckBoxPreference
-            android:key="auto_punctuate"
-            android:title="@string/auto_punctuate"
-            android:summaryOn="@string/auto_punctuate_summary"
-            android:summaryOff="@string/auto_punctuate_summary"
-            android:persistent="false"/>
+    <PreferenceCategory
+            android:key="hardkeyboard_category"
+            android:title="@string/hardkeyboard_category">
+        <CheckBoxPreference
+                android:key="auto_replace"
+                android:title="@string/auto_replace"
+                android:summaryOn="@string/auto_replace_summary"
+                android:summaryOff="@string/auto_replace_summary"
+                android:persistent="false"/>
+        <CheckBoxPreference
+                android:key="auto_caps"
+                android:title="@string/auto_caps"
+                android:summaryOn="@string/auto_caps_summary"
+                android:summaryOff="@string/auto_caps_summary"
+                android:persistent="false"/>
+        <CheckBoxPreference
+                android:key="auto_punctuate"
+                android:title="@string/auto_punctuate"
+                android:summaryOn="@string/auto_punctuate_summary"
+                android:summaryOff="@string/auto_punctuate_summary"
+                android:persistent="false"/>
+    </PreferenceCategory>
 </PreferenceScreen>
diff --git a/res/xml/quick_launch_settings.xml b/res/xml/quick_launch_settings.xml
index 15950ac..eb5585c 100644
--- a/res/xml/quick_launch_settings.xml
+++ b/res/xml/quick_launch_settings.xml
@@ -14,14 +14,10 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <PreferenceCategory
-            android:key="shortcut_category"
-            android:title="@string/quick_launch_title">
-            
-        <!-- Preferences will be filled here. -->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:key="shortcut_category"
+        android:title="@string/quick_launch_title">
             
-    </PreferenceCategory>
+    <!-- Preferences will be filled here. -->
 
 </PreferenceScreen>   
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index e484e86..5c0a1e1 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -15,10 +15,9 @@
 -->
 
 <PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <PreferenceCategory android:title="@string/settings_label"
-            android:key="parent">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/settings_label"
+    android:key="parent">
             
         <PreferenceScreen
             android:title="@string/radio_controls_title"
@@ -127,6 +126,4 @@
                 android:targetClass="com.android.settings.DeviceInfoSettings" />
         </PreferenceScreen>
 
-    </PreferenceCategory>
-
 </PreferenceScreen>
diff --git a/res/xml/sim_lock_settings.xml b/res/xml/sim_lock_settings.xml
index a784cc1..b2ecb11 100644
--- a/res/xml/sim_lock_settings.xml
+++ b/res/xml/sim_lock_settings.xml
@@ -15,10 +15,8 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    
-    <PreferenceCategory
-        android:title="@string/sim_lock_settings"/>
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="@string/sim_lock_settings">
     
     <CheckBoxPreference
             android:key="sim_toggle"
diff --git a/res/xml/sound_and_display_settings.xml b/res/xml/sound_and_display_settings.xml
index 709f89b..2aa44c8 100644
--- a/res/xml/sound_and_display_settings.xml
+++ b/res/xml/sound_and_display_settings.xml
@@ -57,8 +57,7 @@
                 android:key="vibrate"
                 android:title="@string/vibrate_title"
                 android:summary="@string/vibrate_summary"
-                android:persistent="false"
-                android:dependency="silent" />
+                android:persistent="false" />
     
         <com.android.settings.DefaultRingtonePreference
                 android:key="notification_sound"
@@ -85,6 +84,14 @@
                 android:dependency="silent"
                 android:defaultValue="true" />
 
+        <CheckBoxPreference
+                android:key="play_media_notification_sounds"
+                android:title="@string/play_media_notification_sounds_enable_title"
+                android:summaryOn="@string/play_media_notification_sounds_enable_summary_on"
+                android:summaryOff="@string/play_media_notification_sounds_enable_summary_off"
+                android:dependency="silent"
+                android:defaultValue="true" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -94,19 +101,20 @@
                 android:key="animations"
                 android:title="@string/animations_title"
                 android:summaryOn="@string/animations_summary_on"
-                android:summaryOff="@string/animations_summary_off"
-                android:dependency="silent" />
+                android:summaryOff="@string/animations_summary_off" />
 
     
         <com.android.settings.BrightnessPreference
                 android:key="brightness"
                 android:title="@string/brightness"
+                android:summary="@string/brightness_summary"
                 android:dialogIcon="@drawable/ic_popup_brightness"
                 android:dialogTitle="@string/brightness" />
             
         <ListPreference
                 android:key="screen_timeout"
                 android:title="@string/screen_timeout"
+                android:summary="@string/screen_timeout_summary"
                 android:persistent="false"
                 android:entries="@array/screen_timeout_entries"
                 android:entryValues="@array/screen_timeout_values" />
diff --git a/res/xml/testing_settings.xml b/res/xml/testing_settings.xml
index 714523b..87c9cf8 100644
--- a/res/xml/testing_settings.xml
+++ b/res/xml/testing_settings.xml
@@ -14,10 +14,8 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <PreferenceCategory
-            android:title="@string/testing" />
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/testing" >
             
     <PreferenceScreen
             android:title="@string/testing_phone_info">
@@ -38,9 +36,15 @@
             android:title="@string/testing_battery_history">
         <intent android:action="android.intent.action.MAIN"
                 android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.BatteryHistory" />
+                android:targetClass="com.android.settings.battery_history.BatteryHistory" />
     </PreferenceScreen>
 
+    <PreferenceScreen
+            android:title="@string/testing_usage_stats">
+        <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.UsageStats" />
+    </PreferenceScreen>
     <!--    
     <PreferenceScreen
             android:title="@string/testing_sim_toolkit">
diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index b3ce469..3e0ff05 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -14,11 +14,8 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <PreferenceCategory
-            android:title="@string/wifi_advanced_titlebar"
-            />
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/wifi_advanced_titlebar">
 
     <ListPreference
             android:key="num_channels"
diff --git a/res/xml/wifi_settings.xml b/res/xml/wifi_settings.xml
index 7b70621..9101e46 100644
--- a/res/xml/wifi_settings.xml
+++ b/res/xml/wifi_settings.xml
@@ -14,25 +14,21 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/wifi_settings_category">
 
-    <PreferenceCategory
-            android:title="@string/wifi_settings_category">
-
-        <CheckBoxPreference
-                android:key="wifi_enabled"
-                android:title="@string/wifi"
-                android:summary="@string/wifi_quick_toggle_summary"
-                android:persistent="false" />
-
-        <CheckBoxPreference
-                android:key="open_network_notifications_enabled"
-                android:dependency="wifi_enabled"
-                android:title="@string/wifi_notify_open_networks"
-                android:summary="@string/wifi_notify_open_networks_summary"
-                android:persistent="false" />
+    <CheckBoxPreference
+            android:key="wifi_enabled"
+            android:title="@string/wifi"
+            android:summary="@string/wifi_quick_toggle_summary"
+            android:persistent="false" />
 
-    </PreferenceCategory>
+    <CheckBoxPreference
+            android:key="open_network_notifications_enabled"
+            android:dependency="wifi_enabled"
+            android:title="@string/wifi_notify_open_networks"
+            android:summary="@string/wifi_notify_open_networks_summary"
+            android:persistent="false" />
 
     <com.android.settings.ProgressCategory
             android:key="access_points"
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index 5cef5e9..f81fb41 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -14,10 +14,8 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-            <PreferenceCategory
-                android:title="@string/radio_controls_title">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/radio_controls_title">
 
                 <!-- Programmatically will have dynamic summary, but we provide the fallback summary. -->
                 <CheckBoxPreference
@@ -54,13 +52,6 @@
                         android:targetClass="com.android.settings.bluetooth.BluetoothSettings" />
                 </PreferenceScreen>
 
-                <CheckBoxPreference
-                    android:key="toggle_airplane"
-                    android:title="@string/airplane_mode"
-                    android:summary="@string/airplane_mode_summary"
-                    android:persistent="false"
-                    android:disableDependentsState="true" />
-
                 <PreferenceScreen
                     android:title="@string/network_settings_title"
                     android:summary="@string/network_settings_summary"
@@ -71,6 +62,12 @@
                         android:targetClass="com.android.phone.Settings" />
                 </PreferenceScreen>
 
-            </PreferenceCategory>
+                <CheckBoxPreference
+                    android:key="toggle_airplane"
+                    android:title="@string/airplane_mode"
+                    android:summary="@string/airplane_mode_summary"
+                    android:persistent="false"
+                    android:disableDependentsState="true" />
+
 
 </PreferenceScreen>
diff --git a/src/com/android/settings/ActivityPicker.java b/src/com/android/settings/ActivityPicker.java
new file mode 100644
index 0000000..47e005f
--- /dev/null
+++ b/src/com/android/settings/ActivityPicker.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2009 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.LauncherActivity;
+import android.content.Intent;
+import android.os.Parcelable;
+import android.view.View;
+import android.widget.ListView;
+
+/**
+ * Displays a list of all activities matching the incoming {@link Intent.EXTRA_INTENT}
+ * query, along with any applicable icons. 
+ */
+public class ActivityPicker extends LauncherActivity {
+    
+    @Override
+    protected Intent getTargetIntent() {
+        Intent intent = this.getIntent();
+        Intent targetIntent = new Intent(Intent.ACTION_MAIN, null);
+        targetIntent.addCategory(Intent.CATEGORY_DEFAULT);
+        
+        // Use a custom title for this dialog, if provided
+        if (intent.hasExtra(Intent.EXTRA_TITLE)) {
+            String title = intent.getStringExtra(Intent.EXTRA_TITLE);
+            setTitle(title);
+        }
+        
+        Parcelable parcel = intent.getParcelableExtra(Intent.EXTRA_INTENT);
+        if (parcel instanceof Intent) {
+            targetIntent = (Intent) parcel;
+        }
+        
+        return targetIntent;
+    }
+
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        Intent intent = intentForPosition(position);
+        setResult(RESULT_OK, intent);
+        finish();
+    }
+
+}
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 83efa3f..aab529c 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -25,6 +25,7 @@ import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
+import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.Telephony;
 import android.text.TextUtils;
@@ -61,7 +62,7 @@ public class ApnSettings extends PreferenceActivity {
         mCursor = managedQuery(Telephony.Carriers.CONTENT_URI, new String[] {
                 "_id", "name", "apn"}, null, Telephony.Carriers.DEFAULT_SORT_ORDER);
 
-        PreferenceCategory apnList = (PreferenceCategory) findPreference("apn_list");
+        PreferenceGroup apnList = (PreferenceGroup) findPreference("apn_list");
         apnList.removeAll();
         
         mCursor.moveToFirst();
diff --git a/src/com/android/settings/BatteryHistory.java b/src/com/android/settings/BatteryHistory.java
deleted file mode 100644
index 7e077d5..0000000
--- a/src/com/android/settings/BatteryHistory.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import com.android.internal.app.IBatteryStats;
-
-import android.app.Activity;
-import android.os.BatteryStats;
-import android.os.Bundle;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.util.Log;
-import android.widget.TextView;
-
-public class BatteryHistory extends Activity {
-    private static final String TAG = "BatteryHistory";
-    TextView mTextView;
-    IBatteryStats mBatteryInfo;
-
-    private String getDump(BatteryStats stats) {
-        try {
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            PrintWriter pw = new PrintWriter(out, true);
-            stats.dumpLocked(null, pw, null);
-            pw.flush();
-            pw.close();
-            out.close();
-            return new String(out.toByteArray(), 0);
-        } catch (IOException e) {
-            return "IOException";
-        }
-    }
-    
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        Log.i(TAG, "onCreate");
-        setContentView(R.layout.battery_history);
-        mTextView = (TextView) findViewById(R.id.text);
-        mBatteryInfo = IBatteryStats.Stub.asInterface(ServiceManager.getService("batteryinfo"));
-        try {
-            BatteryStats stats = mBatteryInfo.getStatistics();
-            String s = getDump(stats);
-            mTextView.setText(s);
-        } catch (RemoteException e) {
-            mTextView.setText("Got RemoteException");
-            Log.e(TAG, "RemoteException:", e);
-        }
-    }
-}
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index ead38d1..e78215a 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -192,6 +192,7 @@ public class DateTimeSettings
         }
     }
 
+    @Override
     public Dialog onCreateDialog(int id) {
         Dialog d;
 
@@ -226,6 +227,7 @@ public class DateTimeSettings
         return d;
     }
 
+    @Override
     public void onPrepareDialog(int id, Dialog d) {
         switch (id) {
         case DIALOG_DATEPICKER: {
@@ -250,10 +252,13 @@ public class DateTimeSettings
         }
     }
     
+    @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         if (preference == mDatePref) {
             showDialog(DIALOG_DATEPICKER);
         } else if (preference == mTimePref) {
+            // The 24-hour mode may have changed, so recreate the dialog
+            removeDialog(DIALOG_TIMEPICKER);
             showDialog(DIALOG_TIMEPICKER);
         } else if (preference == mTime24Pref) {
             set24Hour(((CheckBoxPreference)mTime24Pref).isChecked());
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 5d72afc..3697319 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -20,6 +20,7 @@ import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.SystemProperties;
 import android.preference.Preference;
@@ -54,10 +55,10 @@ public class DeviceInfoSettings extends PreferenceActivity {
         
         addPreferencesFromResource(R.xml.device_info_settings);
        
-        setSummary("firmware_version", "ro.build.version.release");
-        setSummary("baseband_version", "gsm.version.baseband");
-        setSummary("device_model", "ro.product.model");
-        setSummary("build_number", "ro.build.version.incremental");
+        setStringSummary("firmware_version", Build.VERSION.RELEASE);
+        setValueSummary("baseband_version", "gsm.version.baseband");
+        setStringSummary("device_model", Build.MODEL);
+        setStringSummary("build_number", Build.DISPLAY);
         findPreference("kernel_version").setSummary(getFormattedKernelVersion());
 
         /*
@@ -79,13 +80,22 @@ public class DeviceInfoSettings extends PreferenceActivity {
                 Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
     }
     
-    private void setSummary(String preference, String property) {
+    private void setStringSummary(String preference, String value) {
+        try {
+            findPreference(preference).setSummary(value);
+        } catch (RuntimeException e) {
+            findPreference(preference).setSummary(
+                getResources().getString(R.string.device_info_default));
+        }
+    }
+    
+    private void setValueSummary(String preference, String property) {
         try {
             findPreference(preference).setSummary(
                     SystemProperties.get(property, 
                             getResources().getString(R.string.device_info_default)));
         } catch (RuntimeException e) {
-            
+
         }
     }
 
diff --git a/src/com/android/settings/GadgetPickActivity.java b/src/com/android/settings/GadgetPickActivity.java
new file mode 100644
index 0000000..09e0fc7
--- /dev/null
+++ b/src/com/android/settings/GadgetPickActivity.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.LauncherActivity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.gadget.GadgetInfo;
+import android.gadget.GadgetManager;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ListView;
+import android.util.Log;
+
+import java.util.List;
+import java.util.ArrayList;
+
+public class GadgetPickActivity extends LauncherActivity
+{
+    private static final String TAG = "GadgetPickActivity";
+
+    GadgetManager mGadgetManager;
+    int mGadgetId;
+    int mHostId;
+    
+    public GadgetPickActivity() {
+        mGadgetManager = GadgetManager.getInstance(this);
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        Bundle extras = getIntent().getExtras();
+        mHostId = extras.getInt(GadgetManager.EXTRA_HOST_ID);
+        mGadgetId = extras.getInt(GadgetManager.EXTRA_GADGET_ID);
+
+        setResultData(RESULT_CANCELED);
+    }
+
+    @Override
+    public void onListItemClick(ListView l, View v, int position, long id)
+    {
+        Intent intent = intentForPosition(position);
+        mGadgetManager.bindGadgetId(mGadgetId, intent.getComponent());
+        setResultData(RESULT_OK);
+        finish();
+    }
+    
+    @Override
+    public List<ListItem> makeListItems() {
+        List<GadgetInfo> installed = mGadgetManager.getInstalledProviders();
+        PackageManager pm = getPackageManager();
+
+        Drawable defaultIcon = null;
+        IconResizer resizer = new IconResizer();
+
+        ArrayList<ListItem> result = new ArrayList();
+        final int N = installed.size();
+        for (int i=0; i<N; i++) {
+            GadgetInfo info = installed.get(i);
+
+            LauncherActivity.ListItem item = new LauncherActivity.ListItem();
+            item.packageName = info.provider.getPackageName();
+            item.className = info.provider.getClassName();
+            
+            item.label = info.label;
+            if (info.icon != 0) {
+                Drawable d = pm.getDrawable( item.packageName, info.icon, null);
+                if (d != null) {
+                    item.icon = resizer.createIconThumbnail(d);
+                } else {
+                    Log.w(TAG, "Can't load icon drawable 0x" + Integer.toHexString(info.icon)
+                            + " for package: " + item.packageName);
+                }
+            }
+            if (item.icon == null) {
+                // (including error case above)
+                if (defaultIcon == null) {
+                    // TODO: Load standard icon.
+                }
+                item.icon = defaultIcon;
+            }
+            
+            result.add(item);
+        }
+        return result;
+    }
+    
+    void setResultData(int code) {
+        Intent result = new Intent();
+        result.putExtra(GadgetManager.EXTRA_GADGET_ID, mGadgetId);
+        setResult(code, result);
+    }
+}
+
diff --git a/src/com/android/settings/InstalledAppDetails.java b/src/com/android/settings/InstalledAppDetails.java
index 04121bb..d4dfe97 100644
--- a/src/com/android/settings/InstalledAppDetails.java
+++ b/src/com/android/settings/InstalledAppDetails.java
@@ -66,6 +66,7 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
     private Button mActivitiesButton;
     private boolean mCanUninstall;
     private boolean localLOGV=Config.LOGV || false;
+    private TextView mAppSnippetSize;
     private TextView mTotalSize;
     private TextView mAppSize;
     private TextView mDataSize;
@@ -76,6 +77,7 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
     private TextView mCacheSize;
     private Button mClearCacheButton;
     private ClearCacheObserver mClearCacheObserver;
+    private Button mForceStopButton;
     
     PackageStats mSizeInfo;
     private Button mManageSpaceButton;
@@ -227,10 +229,8 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
             appName = getString(_UNKNOWN_APP);
         }
         ((TextView)findViewById(R.id.app_name)).setText(appName);
-        CharSequence appDesc = mAppInfo.loadDescription(mPm);
-        if(appDesc != null) {
-            ((TextView)findViewById(R.id.app_description)).setText(appDesc);
-        }
+        mAppSnippetSize = ((TextView)findViewById(R.id.app_size));
+        mAppSnippetSize.setText(totalSizeStr);
         //TODO download str and download url
         //set values on views
         mTotalSize = (TextView)findViewById(R.id.total_size_text);
@@ -255,6 +255,8 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
          mCachePanel = findViewById(R.id.cache_panel);
          mCacheSize = (TextView) findViewById(R.id.cache_size_text);
          mClearCacheButton = (Button) findViewById(R.id.clear_cache_button);
+         mForceStopButton = (Button) findViewById(R.id.force_stop_button);
+         mForceStopButton.setOnClickListener(this);
          
          //clear activities
          mActivitiesButton = (Button)findViewById(R.id.clear_activities_button);
@@ -326,13 +328,17 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
         long newTot = newPs.cacheSize+newPs.codeSize+newPs.dataSize;
         if(mSizeInfo == null) {
             mSizeInfo = newPs;
-            mTotalSize.setText(getSizeStr(newTot));
+            String str = getSizeStr(newTot);
+            mTotalSize.setText(str);
+            mAppSnippetSize.setText(str);
             mAppSize.setText(getSizeStr(newPs.codeSize));
             mDataSize.setText(getSizeStr(newPs.dataSize+newPs.cacheSize));
         } else {
             long oldTot = mSizeInfo.cacheSize+mSizeInfo.codeSize+mSizeInfo.dataSize;
             if(newTot != oldTot) {
-                mTotalSize.setText(getSizeStr(newTot));
+                String str = getSizeStr(newTot);
+                mTotalSize.setText(str);
+                mAppSnippetSize.setText(str);
                 changed = true;
             }
             if(newPs.codeSize != mSizeInfo.codeSize) {
@@ -446,6 +452,10 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
                 mClearCacheObserver = new ClearCacheObserver();
             }
             mPm.deleteApplicationCacheFiles(packageName, mClearCacheObserver);
+        } else if (v == mForceStopButton) {
+            ActivityManager am = (ActivityManager)getSystemService(
+                    Context.ACTIVITY_SERVICE);
+            am.restartPackage(packageName);
         }
     }
 
diff --git a/src/com/android/settings/LanguageSettings.java b/src/com/android/settings/LanguageSettings.java
index 2777777..b406df6 100644
--- a/src/com/android/settings/LanguageSettings.java
+++ b/src/com/android/settings/LanguageSettings.java
@@ -17,6 +17,7 @@
 package com.android.settings;
 
 import android.content.ContentResolver;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
@@ -58,11 +59,17 @@ public class LanguageSettings extends PreferenceActivity {
                 removePreference(findPreference("language_category"));
         }
     
-        ContentResolver resolver = getContentResolver();
-        for (int i = 0; i < mSettingsUiKey.length; i++) {
-            CheckBoxPreference pref = (CheckBoxPreference) findPreference(mSettingsUiKey[i]);
-            pref.setChecked(System.getInt(resolver, mSettingsSystemId[i],
-                                          mSettingsDefault[i]) > 0);
+        Configuration config = getResources().getConfiguration();
+        if (config.keyboard != Configuration.KEYBOARD_QWERTY) {
+            getPreferenceScreen().removePreference(
+                    getPreferenceScreen().findPreference("hardkeyboard_category"));
+        } else {
+            ContentResolver resolver = getContentResolver();
+            for (int i = 0; i < mSettingsUiKey.length; i++) {
+                CheckBoxPreference pref = (CheckBoxPreference) findPreference(mSettingsUiKey[i]);
+                pref.setChecked(System.getInt(resolver, mSettingsSystemId[i],
+                                              mSettingsDefault[i]) > 0);
+            }
         }
     }
     
diff --git a/src/com/android/settings/LocalePicker.java b/src/com/android/settings/LocalePicker.java
index 9ee8260..386d7e0 100644
--- a/src/com/android/settings/LocalePicker.java
+++ b/src/com/android/settings/LocalePicker.java
@@ -73,14 +73,14 @@ public class LocalePicker extends ListActivity {
             int len = s.length();
             if (len == 2) {
                 Locale l = new Locale(s);
-                preprocess[finalSize++] = new Loc(l.getDisplayLanguage(), l);
+                preprocess[finalSize++] = new Loc(toTitleCase(l.getDisplayLanguage()), l);
             } else if (len == 5) {
                 String language = s.substring(0, 2);
                 String country = s.substring(3, 5);
                 Locale l = new Locale(language, country);
 
                 if (finalSize == 0) {
-                    preprocess[finalSize++] = new Loc(l.getDisplayLanguage(), l);
+                    preprocess[finalSize++] = new Loc(toTitleCase(l.getDisplayLanguage()), l);
                 } else {
                     // check previous entry:
                     //  same lang and no country -> overwrite it with a lang-only name
@@ -91,17 +91,17 @@ public class LocalePicker extends ListActivity {
                        String prevCountry = preprocess[finalSize-1].locale.getCountry();
                        if (prevCountry.length() == 0) {
                             preprocess[finalSize-1].locale = l;
-                            preprocess[finalSize-1].label = l.getDisplayLanguage();
+                            preprocess[finalSize-1].label = toTitleCase(l.getDisplayLanguage());
                         } else {
-                            preprocess[finalSize-1].label = preprocess[finalSize-1].locale.getDisplayName();
-                            preprocess[finalSize++] = new Loc(l.getDisplayName(), l);
+                            preprocess[finalSize-1].label = toTitleCase(preprocess[finalSize-1].locale.getDisplayName());
+                            preprocess[finalSize++] = new Loc(toTitleCase(l.getDisplayName()), l);
                         }
                     } else {
                         String displayName;
                         if (s.equals("zz_ZZ")) {
                             displayName = "Pseudo...";
                         } else {
-                            displayName = l.getDisplayLanguage();
+                            displayName = toTitleCase(l.getDisplayLanguage());
                         }
                         preprocess[finalSize++] = new Loc(displayName, l);
                     }
@@ -118,6 +118,14 @@ public class LocalePicker extends ListActivity {
         getListView().setAdapter(adapter);
     }
 
+    private static String toTitleCase(String s) {
+        if (s.length() == 0) {
+            return s;
+        }
+
+        return Character.toUpperCase(s.charAt(0)) + s.substring(1);
+    }
+
     @Override
     public void onResume() {
         super.onResume();
diff --git a/src/com/android/settings/ManageApplications.java b/src/com/android/settings/ManageApplications.java
index f1550f9..e5311ae 100644
--- a/src/com/android/settings/ManageApplications.java
+++ b/src/com/android/settings/ManageApplications.java
@@ -17,8 +17,8 @@
 package com.android.settings;
 
 import com.android.settings.R;
-import android.app.Activity;
 import android.app.ActivityManager;
+import android.app.AlertDialog;
 import android.app.ListActivity;
 import android.app.ProgressDialog;
 import android.content.BroadcastReceiver;
@@ -90,7 +90,8 @@ import java.util.TreeMap;
  *  InstalledAppDetailsActivity to avoid recomputation of the package size information.
  */
 public class ManageApplications extends ListActivity implements
-        OnItemClickListener, DialogInterface.OnCancelListener {
+        OnItemClickListener, DialogInterface.OnCancelListener,
+        DialogInterface.OnClickListener {
     // TAG for this activity
     private static final String TAG = "ManageApplications";
     
@@ -119,6 +120,9 @@ public class ManageApplications extends ListActivity implements
     public static final int FILTER_APPS_ALL = MENU_OPTIONS_BASE + 2;
     public static final int FILTER_APPS_THIRD_PARTY = MENU_OPTIONS_BASE + 3;
     public static final int FILTER_APPS_RUNNING = MENU_OPTIONS_BASE + 4;
+    public static final int FILTER_OPTIONS = MENU_OPTIONS_BASE + 5;
+    // Alert Dialog presented to user to find out the filter option
+    AlertDialog.Builder mAlertDlgBuilder;
     // sort order
     private int mSortOrder = SORT_ORDER_ALPHA;
     // Filter value
@@ -295,11 +299,7 @@ public class ManageApplications extends ListActivity implements
                         // end computation here
                         mDoneIniting = true;
                         mAppInfoAdapter.sortList(mSortOrder);
-                        //load resources now
-                        if(mResourceThread.isAlive()) {
-                            mResourceThread.interrupt();
-                        }
-                        mResourceThread.loadAllResources(mAppInfoAdapter.getAppList());
+                        setProgressBarIndeterminateVisibility(false);
                     }
                 }
                 break;
@@ -381,7 +381,15 @@ public class ManageApplications extends ListActivity implements
                     Log.w(TAG, "Error loading icons for applications");
                 } else {
                     mAppInfoAdapter.updateAppsResourceInfo(iconMap);
-                    setProgressBarIndeterminateVisibility(false);
+                }
+                // initiate compute pkg sizes
+                if (localLOGV) Log.i(TAG, "Initiating compute sizes for first time");
+                mObserver = new PkgSizeObserver();
+                if (mAppInfoAdapter.getCount() > 0) {
+                    mObserver.invokeGetSizeInfo(mAppInfoAdapter.getApplicationInfo(0),
+                            COMPUTE_PKG_SIZE_DONE);
+                } else {
+                    mDoneIniting = true;
                 }
             default:
                 break;
@@ -398,7 +406,15 @@ public class ManageApplications extends ListActivity implements
         if (filterOption == FILTER_APPS_THIRD_PARTY) {
             List<ApplicationInfo> appList =new ArrayList<ApplicationInfo> ();
             for (ApplicationInfo appInfo : installedAppList) {
+                boolean flag = false;
                 if ((appInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
+                    // Updated system app
+                    flag = true;
+                } else if ((appInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
+                    // Non-system app
+                    flag = true;
+                }
+                if (flag) {
                     appList.add(appInfo);
                 }
             }
@@ -457,14 +473,11 @@ public class ManageApplications extends ListActivity implements
         // register receiver
         mReceiver = new PackageIntentReceiver();
         mReceiver.registerReceiver();
-        // initiate compute pkg sizes
-        if (localLOGV) Log.i(TAG, "Initiating compute sizes for first time");
-        mObserver = new PkgSizeObserver();
-        if(appList.size() > 0) {
-            mObserver.invokeGetSizeInfo(appList.get(0), COMPUTE_PKG_SIZE_DONE);
-        } else {
-            mDoneIniting = true;
+        //load resources now
+        if(mResourceThread.isAlive()) {
+            mResourceThread.interrupt();
         }
+        mResourceThread.loadAllResources(appList);
     }
     
     // internal structure used to track added and deleted packages when
@@ -717,7 +730,9 @@ public class ManageApplications extends ListActivity implements
                 if(mInfo.appIcon != null) {
                     holder.appIcon.setImageDrawable(mInfo.appIcon);
                 }
-                holder.appSize.setText(mInfo.appSize);
+                if (mInfo.appSize != null) {
+                    holder.appSize.setText(mInfo.appSize);
+                }
             } else {
                 Log.w(TAG, "No info for package:"+appInfo.packageName+" in property map");
             }
@@ -1123,9 +1138,7 @@ public class ManageApplications extends ListActivity implements
                 .setIcon(android.R.drawable.ic_menu_sort_alphabetically);
         menu.add(0, SORT_ORDER_SIZE, 2, R.string.sort_order_size)
                 .setIcon(android.R.drawable.ic_menu_sort_by_size); 
-        menu.add(0, FILTER_APPS_ALL, 3, R.string.filter_apps_all);
-        menu.add(0, FILTER_APPS_RUNNING, 4, R.string.filter_apps_running);
-        menu.add(0, FILTER_APPS_THIRD_PARTY, 5, R.string.filter_apps_third_party);        
+        menu.add(0, FILTER_OPTIONS, 3, R.string.filter);
         return true;
     }
     
@@ -1134,11 +1147,7 @@ public class ManageApplications extends ListActivity implements
         if (mDoneIniting) {
             menu.findItem(SORT_ORDER_ALPHA).setVisible(mSortOrder != SORT_ORDER_ALPHA);
             menu.findItem(SORT_ORDER_SIZE).setVisible(mSortOrder != SORT_ORDER_SIZE);
-            menu.findItem(FILTER_APPS_ALL).setVisible(mFilterApps != FILTER_APPS_ALL);
-            menu.findItem(FILTER_APPS_THIRD_PARTY).setVisible(
-                    mFilterApps != FILTER_APPS_THIRD_PARTY);
-            menu.findItem(FILTER_APPS_RUNNING).setVisible(
-                    mFilterApps != FILTER_APPS_RUNNING);
+            menu.findItem(FILTER_OPTIONS).setVisible(true);
             return true;
         } 
         return false;
@@ -1147,7 +1156,20 @@ public class ManageApplications extends ListActivity implements
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int menuId = item.getItemId();
-        sendMessageToHandler(REORDER_LIST, menuId);
+        if ((menuId == SORT_ORDER_ALPHA) || (menuId == SORT_ORDER_SIZE)) {
+            sendMessageToHandler(REORDER_LIST, menuId);
+        } else if (menuId == FILTER_OPTIONS) {
+            if (mAlertDlgBuilder == null) {
+                mAlertDlgBuilder = new AlertDialog.Builder(this).
+                setTitle(R.string.filter_dlg_title).
+                setNeutralButton(R.string.cancel, this).
+                setSingleChoiceItems(new CharSequence[] {getText(R.string.filter_apps_all),
+                        getText(R.string.filter_apps_running),
+                        getText(R.string.filter_apps_third_party)},
+                        -1, this);
+            }
+            mAlertDlgBuilder.show();
+        }
         return true;
     }
 
@@ -1162,4 +1184,24 @@ public class ManageApplications extends ListActivity implements
         mLoadingDlg = null;
         finish();
     }
+
+    public void onClick(DialogInterface dialog, int which) {
+        int newOption;
+        switch (which) {
+        // Make sure that values of 0, 1, 2 match options all, running, third_party when
+        // created via the AlertDialog.Builder
+        case 0:
+            newOption = FILTER_APPS_ALL;
+            break;
+        case 1:
+            newOption = FILTER_APPS_RUNNING;
+            break;
+        case 2:
+            newOption = FILTER_APPS_THIRD_PARTY;
+            break;
+        default:
+            return;
+        }
+        sendMessageToHandler(REORDER_LIST, newOption);
+    }
 }
diff --git a/src/com/android/settings/MediaFormat.java b/src/com/android/settings/MediaFormat.java
new file mode 100644
index 0000000..3594572
--- /dev/null
+++ b/src/com/android/settings/MediaFormat.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import com.android.internal.widget.LockPatternUtils;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.IMountService;
+import android.os.ServiceManager;
+import android.os.SystemProperties;
+import android.os.Environment;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+
+/**
+ * Confirm and execute a format of the sdcard.
+ * Multiple confirmations are required: first, a general "are you sure
+ * you want to do this?" prompt, followed by a keyguard pattern trace if the user
+ * has defined one, followed by a final strongly-worded "THIS WILL ERASE EVERYTHING
+ * ON THE SD CARD" prompt.  If at any time the phone is allowed to go to sleep, is
+ * locked, et cetera, then the confirmation sequence is abandoned.
+ */
+public class MediaFormat extends Activity {
+
+    private static final int KEYGUARD_REQUEST = 55;
+
+    private LayoutInflater mInflater;
+    private LockPatternUtils mLockUtils;
+
+    private View mInitialView;
+    private Button mInitiateButton;
+
+    private View mFinalView;
+    private Button mFinalButton;
+
+    /** 
+     * The user has gone through the multiple confirmation, so now we go ahead
+     * and invoke the Mount Service to format the SD card.
+     */
+    private Button.OnClickListener mFinalClickListener = new Button.OnClickListener() {
+            public void onClick(View v) {
+                
+                // Those monkeys kept committing suicide, so we add this property
+                // to disable going through with the format
+                if (!TextUtils.isEmpty(SystemProperties.get("ro.monkey"))) {
+                    return;
+                }
+                IMountService service =
+                        IMountService.Stub.asInterface(ServiceManager.getService("mount"));
+                if (service != null) {
+                    try {
+                        service.formatMedia(Environment.getExternalStorageDirectory().toString());
+                    } catch (android.os.RemoteException e) {
+                        // Intentionally blank - there's nothing we can do here
+                        Log.w("MediaFormat", "Unable to invoke IMountService.formatMedia()");
+                    }
+                } else {
+                    Log.w("MediaFormat", "Unable to locate IMountService");
+                }
+            finish();
+            }
+        };
+
+    /**
+     *  Keyguard validation is run using the standard {@link ConfirmLockPattern}
+     * component as a subactivity
+     */
+    private void runKeyguardConfirmation() {
+        final Intent intent = new Intent();
+        intent.setClassName("com.android.settings",
+                "com.android.settings.ConfirmLockPattern");
+        // supply header and footer text in the intent
+        intent.putExtra(ConfirmLockPattern.HEADER_TEXT,
+                getText(R.string.media_format_gesture_prompt));
+        intent.putExtra(ConfirmLockPattern.FOOTER_TEXT,
+                getText(R.string.media_format_gesture_explanation));
+        startActivityForResult(intent, KEYGUARD_REQUEST);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode != KEYGUARD_REQUEST) {
+            return;
+        }
+
+        // If the user entered a valid keyguard trace, present the final
+        // confirmation prompt; otherwise, go back to the initial state.
+        if (resultCode == Activity.RESULT_OK) {
+            establishFinalConfirmationState();
+        } else {
+            establishInitialState();
+        }
+    }
+
+    /**
+     * If the user clicks to begin the reset sequence, we next require a
+     * keyguard confirmation if the user has currently enabled one.  If there
+     * is no keyguard available, we simply go to the final confirmation prompt.
+     */
+    private Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
+            public void onClick(View v) {
+                if (mLockUtils.isLockPatternEnabled()) {
+                    runKeyguardConfirmation();
+                } else {
+                    establishFinalConfirmationState();
+                }
+            }
+        };
+
+    /**
+     * Configure the UI for the final confirmation interaction
+     */
+    private void establishFinalConfirmationState() {
+        if (mFinalView == null) {
+            mFinalView = mInflater.inflate(R.layout.media_format_final, null);
+            mFinalButton =
+                    (Button) mFinalView.findViewById(R.id.execute_media_format);
+            mFinalButton.setOnClickListener(mFinalClickListener);
+        }
+
+        setContentView(mFinalView);
+    }
+
+    /**
+     * In its initial state, the activity presents a button for the user to
+     * click in order to initiate a confirmation sequence.  This method is
+     * called from various other points in the code to reset the activity to
+     * this base state.
+     * 
+     * <p>Reinflating views from resources is expensive and prevents us from
+     * caching widget pointers, so we use a single-inflate pattern:  we lazy-
+     * inflate each view, caching all of the widget pointers we'll need at the
+     * time, then simply reuse the inflated views directly whenever we need
+     * to change contents.
+     */
+    private void establishInitialState() {
+        if (mInitialView == null) {
+            mInitialView = mInflater.inflate(R.layout.media_format_primary, null);
+            mInitiateButton =
+                    (Button) mInitialView.findViewById(R.id.initiate_media_format);
+            mInitiateButton.setOnClickListener(mInitiateListener);
+        }
+
+        setContentView(mInitialView);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedState) {
+        super.onCreate(savedState);
+
+        mInitialView = null;
+        mFinalView = null;
+        mInflater = LayoutInflater.from(this);
+        mLockUtils = new LockPatternUtils(getContentResolver());
+
+        establishInitialState();
+    }
+
+    /** Abandon all progress through the confirmation sequence by returning
+     * to the initial view any time the activity is interrupted (e.g. by
+     * idle timeout).
+     */
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        establishInitialState();
+    }
+
+}
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index b1ad777..b7ff28a 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -119,10 +119,12 @@ public class RadioInfo extends Activity {
     private TextView mPingHostname;
     private TextView mHttpClientTest;
     private TextView cipherState;
+    private TextView dnsCheckState;
     private EditText smsc;
     private Button radioPowerButton;
     private Button qxdmLogButton;
     private Button cipherToggleButton;
+    private Button dnsCheckToggleButton;
     private Button pingTestButton;
     private Button updateSmscButton;
     private Button refreshSmscButton;
@@ -428,6 +430,7 @@ public class RadioInfo extends Activity {
         received = (TextView) findViewById(R.id.received);
         cipherState = (TextView) findViewById(R.id.ciphState);
         smsc = (EditText) findViewById(R.id.smsc);
+        dnsCheckState = (TextView) findViewById(R.id.dnsCheckState);
 
         mPingIpAddr = (TextView) findViewById(R.id.pingIpAddr);
         mPingHostname = (TextView) findViewById(R.id.pingHostname);
@@ -454,6 +457,8 @@ public class RadioInfo extends Activity {
         updateSmscButton.setOnClickListener(mUpdateSmscButtonHandler);
         refreshSmscButton = (Button) findViewById(R.id.refresh_smsc);
         refreshSmscButton.setOnClickListener(mRefreshSmscButtonHandler);
+        dnsCheckToggleButton = (Button) findViewById(R.id.dns_check_toggle);
+        dnsCheckToggleButton.setOnClickListener(mDnsCheckButtonHandler);
         
         mPhoneStateReceiver = new PhoneStateIntentReceiver(this, mHandler);
         mPhoneStateReceiver.notifySignalStrength(EVENT_SIGNAL_STRENGTH_CHANGED);
@@ -490,6 +495,7 @@ public class RadioInfo extends Activity {
         updateQxdmState(null);
         updateProperties();
         updateCiphState();
+        updateDnsCheckState();
 
         Log.i(TAG, "[RadioInfo] onResume: register phone & data intents");
 
@@ -614,6 +620,12 @@ public class RadioInfo extends Activity {
         cipherState.setText(getCiphPref() ? "Ciphering ON" : "Ciphering OFF");
     }
 
+    private void updateDnsCheckState() {
+        GSMPhone gsmPhone = (GSMPhone) phone;
+        dnsCheckState.setText(gsmPhone.isDnsCheckDisabled() ?
+                "0.0.0.0 allowed" :"0.0.0.0 not allowed");
+    }
+    
     private final void
     updateSignalStrength() {
         int state =
@@ -806,10 +818,10 @@ public class RadioInfo extends Activity {
         Resources r = getResources();
 
         try {
-            int txPackets = netstat.getTxPackets();
-            int rxPackets = netstat.getRxPackets();
-            int txBytes   = netstat.getTxBytes();
-            int rxBytes   = netstat.getRxBytes();
+            long txPackets = netstat.getMobileTxPackets();
+            long rxPackets = netstat.getMobileRxPackets();
+            long txBytes   = netstat.getMobileTxBytes();
+            long rxBytes   = netstat.getMobileRxBytes();
     
             String packets = r.getString(R.string.radioInfo_display_packets);
             String bytes   = r.getString(R.string.radioInfo_display_bytes);
@@ -1114,6 +1126,14 @@ public class RadioInfo extends Activity {
         }
     };
     
+    OnClickListener mDnsCheckButtonHandler = new OnClickListener() {
+        public void onClick(View v) {
+            GSMPhone gsmPhone = (GSMPhone) phone;
+            gsmPhone.disableDnsCheck(!gsmPhone.isDnsCheckDisabled());
+            updateDnsCheckState();
+        }
+    };
+    
     OnClickListener mPingButtonHandler = new OnClickListener() {
         public void onClick(View v) {
             updatePingState();
diff --git a/src/com/android/settings/SdCardErrorReceiver.java b/src/com/android/settings/SdCardErrorReceiver.java
deleted file mode 100644
index ba35a3c..0000000
--- a/src/com/android/settings/SdCardErrorReceiver.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.BroadcastReceiver;
-import android.util.Log;
-import android.widget.Toast;
-
-
-/**
- * Glue class: connects AlarmAlert IntentReceiver to AlarmAlert
- * activity.  Passes through Alarm ID.
- */
-public class SdCardErrorReceiver extends BroadcastReceiver {
-
-    private static final String TAG = "SdCardErrorReceiver";
-
-    @Override public void onReceive(Context context, Intent intent) {
-        String action = intent.getAction();
-        final int duration = 3500;
-        if (action.equals(Intent.ACTION_MEDIA_BAD_REMOVAL)) {
-            Toast.makeText(context, R.string.sdcard_removal_alert_title, duration).show();
-        } else if (action.equals(Intent.ACTION_MEDIA_UNMOUNTABLE)) {
-            Toast.makeText(context, R.string.sdcard_unmountable_alert_title, duration).show();
-        } else {
-            Log.e(TAG, "unknown intent");
-        }
-    }
-}
diff --git a/src/com/android/settings/SdCardSettings.java b/src/com/android/settings/SdCardSettings.java
index d10166a..b6935a2 100644
--- a/src/com/android/settings/SdCardSettings.java
+++ b/src/com/android/settings/SdCardSettings.java
@@ -60,6 +60,9 @@ public class SdCardSettings extends Activity
         Button unmountButton = (Button)findViewById(R.id.sdcard_unmount);
         unmountButton.setOnClickListener(mUnmountButtonHandler);
 
+        Button formatButton = (Button)findViewById(R.id.sdcard_format);
+        formatButton.setOnClickListener(mFormatButtonHandler);
+
         mTotalSize = (TextView)findViewById(R.id.total);
         mUsedSize = (TextView)findViewById(R.id.used);
         mAvailableSize = (TextView)findViewById(R.id.available);
@@ -69,6 +72,8 @@ public class SdCardSettings extends Activity
         intentFilter.addAction(Intent.ACTION_MEDIA_UNMOUNTED);
         intentFilter.addAction(Intent.ACTION_MEDIA_MOUNTED);
         intentFilter.addAction(Intent.ACTION_MEDIA_SHARED);
+        intentFilter.addAction(Intent.ACTION_MEDIA_CHECKING);
+        intentFilter.addAction(Intent.ACTION_MEDIA_NOFS);
         intentFilter.addAction(Intent.ACTION_MEDIA_BAD_REMOVAL);
         intentFilter.addAction(Intent.ACTION_MEDIA_SCANNER_STARTED);
         intentFilter.addAction(Intent.ACTION_MEDIA_SCANNER_FINISHED);
@@ -198,6 +203,15 @@ public class SdCardSettings extends Activity
         }
     };
 
+    OnClickListener mFormatButtonHandler = new OnClickListener() {
+        public void onClick(View v) {
+            try {
+                mMountService.formatMedia(Environment.getExternalStorageDirectory().toString());
+            } catch (RemoteException ex) {
+            }
+        }
+    };
+
 
     private int         mStatus;
     private IMountService   mMountService;
diff --git a/src/com/android/settings/SoundAndDisplaySettings.java b/src/com/android/settings/SoundAndDisplaySettings.java
index 134e84f..53912e3 100644
--- a/src/com/android/settings/SoundAndDisplaySettings.java
+++ b/src/com/android/settings/SoundAndDisplaySettings.java
@@ -25,6 +25,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.media.AudioManager;
 import android.os.Bundle;
+import android.os.IMountService;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.preference.ListPreference;
@@ -49,8 +50,21 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
     private static final String KEY_DTMF_TONE = "dtmf_tone";
     private static final String KEY_SOUND_EFFECTS = "sound_effects";
     private static final String KEY_ANIMATIONS = "animations";
+    private static final String KEY_PLAY_MEDIA_NOTIFICATION_SOUNDS = "play_media_notification_sounds";
     
     private CheckBoxPreference mSilent;
+
+    private CheckBoxPreference mPlayMediaNotificationSounds;
+
+    private IMountService mMountService = null;
+
+    /*
+     * If we are currently in one of the silent modes (the ringer mode is set to either
+     * "silent mode" or "vibrate mode"), then toggling the "Phone vibrate"
+     * preference will switch between "silent mode" and "vibrate mode".
+     * Otherwise, it will adjust the normal ringer mode's ring or ring+vibrate
+     * setting.
+     */
     private CheckBoxPreference mVibrate;
     private CheckBoxPreference mDtmfTone;
     private CheckBoxPreference mSoundEffects;
@@ -64,14 +78,7 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
     private BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            
-            int ringerMode = intent
-                    .getIntExtra(AudioManager.EXTRA_RINGER_MODE, AudioManager.RINGER_MODE_NORMAL);
-            boolean isSilentMode = ringerMode != AudioManager.RINGER_MODE_NORMAL;
-            
-            if (mSilent.isChecked() != isSilentMode) {
-                mSilent.setChecked(isSilentMode);
-            }
+            updateState(false);
         }
     };
 
@@ -82,10 +89,14 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
         
         mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
         mWindowManager = IWindowManager.Stub.asInterface(ServiceManager.getService("window"));
+
+        mMountService = IMountService.Stub.asInterface(ServiceManager.getService("mount"));
         
         addPreferencesFromResource(R.xml.sound_and_display_settings);
         
         mSilent = (CheckBoxPreference) findPreference(KEY_SILENT);
+        mPlayMediaNotificationSounds = (CheckBoxPreference) findPreference(KEY_PLAY_MEDIA_NOTIFICATION_SOUNDS);
+
         mVibrate = (CheckBoxPreference) findPreference(KEY_VIBRATE);
         mDtmfTone = (CheckBoxPreference) findPreference(KEY_DTMF_TONE);
         mDtmfTone.setPersistent(false);
@@ -123,17 +134,28 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
     }
 
     private void updateState(boolean force) {
-        final boolean silent = mAudioManager.getRingerMode() != AudioManager.RINGER_MODE_NORMAL;
-        final boolean phoneVibrate = mAudioManager
-                .getVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER)
-                        == AudioManager.VIBRATE_SETTING_ON;
+        final int ringerMode = mAudioManager.getRingerMode();
+        final boolean silentOrVibrateMode =
+                ringerMode != AudioManager.RINGER_MODE_NORMAL;
         
-        if (silent != mSilent.isChecked() || force) {
-            mSilent.setChecked(silent);
+        if (silentOrVibrateMode != mSilent.isChecked() || force) {
+            mSilent.setChecked(silentOrVibrateMode);
         }
-        
-        if (phoneVibrate != mVibrate.isChecked() || force) {
-            mVibrate.setChecked(phoneVibrate);
+
+        try {
+            mPlayMediaNotificationSounds.setChecked(mMountService.getPlayNotificationSounds());
+        } catch (RemoteException e) {
+        }
+       
+        boolean vibrateSetting;
+        if (silentOrVibrateMode) {
+            vibrateSetting = ringerMode == AudioManager.RINGER_MODE_VIBRATE;
+        } else {
+            vibrateSetting = mAudioManager.getVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER)
+                    == AudioManager.VIBRATE_SETTING_ON;            
+        }
+        if (vibrateSetting != mVibrate.isChecked() || force) {
+            mVibrate.setChecked(vibrateSetting);
         }
         
         boolean animations = true;
@@ -161,12 +183,26 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
             final boolean silent = mSilent.isChecked();
             mAudioManager.setRingerMode(silent ? AudioManager.RINGER_MODE_SILENT
                     : AudioManager.RINGER_MODE_NORMAL);
+            updateState(false);
             
+        } else if (preference == mPlayMediaNotificationSounds) {
+            try {
+                mMountService.setPlayNotificationSounds(mPlayMediaNotificationSounds.isChecked());
+            } catch (RemoteException e) {
+            }
         } else if (preference == mVibrate) {
             final boolean vibrate = mVibrate.isChecked();
-            mAudioManager.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER,
-                    vibrate ? AudioManager.VIBRATE_SETTING_ON
-                            : AudioManager.VIBRATE_SETTING_OFF);
+            final boolean silent = mSilent.isChecked();
+            
+            if (silent) {
+                mAudioManager.setRingerMode(vibrate ? AudioManager.RINGER_MODE_VIBRATE :
+                    AudioManager.RINGER_MODE_SILENT);                
+            } else {
+                mAudioManager.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER,
+                        vibrate ? AudioManager.VIBRATE_SETTING_ON
+                                : AudioManager.VIBRATE_SETTING_OFF);
+            }
+            
         } else if (preference == mDtmfTone) {
             Settings.System.putInt(getContentResolver(), Settings.System.DTMF_TONE_WHEN_DIALING,
                     mDtmfTone.isChecked() ? 1 : 0);
diff --git a/src/com/android/settings/UsageStats.java b/src/com/android/settings/UsageStats.java
new file mode 100755
index 0000000..89caa54
--- /dev/null
+++ b/src/com/android/settings/UsageStats.java
@@ -0,0 +1,249 @@
+
+
+/**
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.android.settings;
+
+import com.android.internal.app.IUsageStats;
+import com.android.settings.R;
+import android.app.Activity;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import com.android.internal.os.PkgUsageStats;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.ListView;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.AdapterView.OnItemSelectedListener;
+
+/**
+ * Activity to display package usage statistics.
+ */
+public class UsageStats extends Activity implements OnItemSelectedListener {
+    private static final String TAG="UsageStatsActivity";
+    private static final boolean localLOGV = true;
+    private Spinner mTypeSpinner;
+    private ListView mListView;
+    private IUsageStats mUsageStatsService;
+    private LayoutInflater mInflater;
+    private UsageStatsAdapter mAdapter;
+    private PackageManager mPm;
+    
+    public static class AppNameComparator implements Comparator<PkgUsageStats> {
+        Map<String, CharSequence> mAppLabelList;
+        AppNameComparator(Map<String, CharSequence> appList) {
+            mAppLabelList = appList;
+        }
+        public final int compare(PkgUsageStats a, PkgUsageStats b) {
+            String alabel = mAppLabelList.get(a.packageName).toString();
+            String blabel = mAppLabelList.get(b.packageName).toString();
+            return alabel.compareTo(blabel);
+        }
+    }
+    
+    public static class LaunchCountComparator implements Comparator<PkgUsageStats> {
+        public final int compare(PkgUsageStats a, PkgUsageStats b) {
+            // return by descending order
+            return b.launchCount - a.launchCount;
+        }
+    }
+    
+    public static class UsageTimeComparator implements Comparator<PkgUsageStats> {
+        public final int compare(PkgUsageStats a, PkgUsageStats b) {
+            long ret = a.usageTime-b.usageTime;
+            if (ret == 0) {
+                return 0;
+            }
+            if (ret < 0) {
+                return 1;
+            }
+            return -1;
+        }
+    }
+    
+     // View Holder used when displaying views
+    static class AppViewHolder {
+        TextView pkgName;
+        TextView launchCount;
+        TextView usageTime;
+    }
+    
+    class UsageStatsAdapter extends BaseAdapter {
+         // Constants defining order for display order
+        private static final int _DISPLAY_ORDER_USAGE_TIME = 0;
+        private static final int _DISPLAY_ORDER_LAUNCH_COUNT = 1;
+        private static final int _DISPLAY_ORDER_APP_NAME = 2;
+        
+        private int mDisplayOrder = _DISPLAY_ORDER_USAGE_TIME;
+        private List<PkgUsageStats> mUsageStats;
+        private LaunchCountComparator mLaunchCountComparator;
+        private UsageTimeComparator mUsageTimeComparator;
+        private AppNameComparator mAppLabelComparator;
+        private HashMap<String, CharSequence> mAppLabelMap;
+        
+        UsageStatsAdapter() {
+            mUsageStats = new ArrayList<PkgUsageStats>();
+            mAppLabelMap = new HashMap<String, CharSequence>();
+            PkgUsageStats[] stats;
+            try {
+                stats = mUsageStatsService.getAllPkgUsageStats();
+            } catch (RemoteException e) {
+                Log.e(TAG, "Failed initializing usage stats service");
+                return;
+            }
+           if (stats == null) {
+               return;
+           }
+           for (PkgUsageStats ps : stats) {
+               mUsageStats.add(ps);
+               // load application labels for each application
+               CharSequence label;
+               try {
+                   ApplicationInfo appInfo = mPm.getApplicationInfo(ps.packageName, 0);
+                   label = appInfo.loadLabel(mPm);
+                } catch (NameNotFoundException e) {
+                    label = ps.packageName;
+                }
+                mAppLabelMap.put(ps.packageName, label);
+           }
+           // Sort list
+           mLaunchCountComparator = new LaunchCountComparator();
+           mUsageTimeComparator = new UsageTimeComparator();
+           mAppLabelComparator = new AppNameComparator(mAppLabelMap);
+           sortList();
+        }
+        public int getCount() {
+            return mUsageStats.size();
+        }
+
+        public Object getItem(int position) {
+            return mUsageStats.get(position);
+        }
+
+        public long getItemId(int position) {
+            return position;
+        }
+
+        public View getView(int position, View convertView, ViewGroup parent) {
+            // A ViewHolder keeps references to children views to avoid unneccessary calls
+            // to findViewById() on each row.
+            AppViewHolder holder;
+
+            // When convertView is not null, we can reuse it directly, there is no need
+            // to reinflate it. We only inflate a new View when the convertView supplied
+            // by ListView is null.
+            if (convertView == null) {
+                convertView = mInflater.inflate(R.layout.usage_stats_item, null);
+
+                // Creates a ViewHolder and store references to the two children views
+                // we want to bind data to.
+                holder = new AppViewHolder();
+                holder.pkgName = (TextView) convertView.findViewById(R.id.package_name);
+                holder.launchCount = (TextView) convertView.findViewById(R.id.launch_count);
+                holder.usageTime = (TextView) convertView.findViewById(R.id.usage_time);
+                convertView.setTag(holder);
+            } else {
+                // Get the ViewHolder back to get fast access to the TextView
+                // and the ImageView.
+                holder = (AppViewHolder) convertView.getTag();
+            }
+
+            // Bind the data efficiently with the holder
+            PkgUsageStats pkgStats = mUsageStats.get(position);
+            if (pkgStats != null) {
+                CharSequence label = mAppLabelMap.get(pkgStats.packageName);
+                holder.pkgName.setText(label);
+                holder.launchCount.setText(String.valueOf(pkgStats.launchCount));
+                holder.usageTime.setText(String.valueOf(pkgStats.usageTime)+" ms");
+            } else {
+                Log.w(TAG, "No usage stats info for package:"+pkgStats.packageName);
+            }
+            return convertView;
+        }
+        
+        void sortList(int sortOrder) {
+            if (mDisplayOrder == sortOrder) {
+                // do nothing
+                return;
+            }
+            mDisplayOrder= sortOrder;
+            sortList();
+        }
+        private void sortList() {
+            if (mDisplayOrder == _DISPLAY_ORDER_USAGE_TIME) {
+                if (localLOGV) Log.i(TAG, "Sorting by usage time");
+                Collections.sort(mUsageStats, mUsageTimeComparator);
+            } else if (mDisplayOrder == _DISPLAY_ORDER_LAUNCH_COUNT) {
+                if (localLOGV) Log.i(TAG, "Sorting launch count");
+                Collections.sort(mUsageStats, mLaunchCountComparator);
+            } else if (mDisplayOrder == _DISPLAY_ORDER_APP_NAME) {
+                if (localLOGV) Log.i(TAG, "Sorting by application name");
+                Collections.sort(mUsageStats, mAppLabelComparator);
+            }
+            notifyDataSetChanged();
+        }
+    }
+
+    /** Called when the activity is first created. */
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        mUsageStatsService = IUsageStats.Stub.asInterface(ServiceManager.getService("usagestats"));
+        if (mUsageStatsService == null) {
+            Log.e(TAG, "Failed to retrieve usagestats service");
+            return;
+        }
+        mInflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        mPm = getPackageManager();
+        
+        setContentView(R.layout.usage_stats);
+        mTypeSpinner = (Spinner) findViewById(R.id.typeSpinner);
+        mTypeSpinner.setOnItemSelectedListener(this);
+        
+        mListView = (ListView) findViewById(R.id.pkg_list);
+        // Initialize the inflater
+        
+        mAdapter = new UsageStatsAdapter();
+        mListView.setAdapter(mAdapter);
+    }
+
+    public void onItemSelected(AdapterView<?> parent, View view, int position,
+            long id) {
+        mAdapter.sortList(position);
+    }
+
+    public void onNothingSelected(AdapterView<?> parent) {
+        // do nothing
+    }
+}
+
diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index 5d3c8ac..8b86a6b 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -21,6 +21,7 @@ import android.app.Dialog;
 import android.app.ListActivity;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.provider.UserDictionary;
@@ -54,6 +55,8 @@ public class UserDictionarySettings extends ListActivity {
             + UserDictionary.Words.LOCALE + " is null";
 
     private static final String DELETE_SELECTION = UserDictionary.Words.WORD + "=?";
+
+    private static final String EXTRA_WORD = "word";
     
     private static final int CONTEXT_MENU_EDIT = Menu.FIRST;
     private static final int CONTEXT_MENU_DELETE = Menu.FIRST + 1;
@@ -87,6 +90,16 @@ public class UserDictionarySettings extends ListActivity {
     }
     
     @Override
+    protected void onResume() {
+        super.onResume();
+        if (getIntent().getAction().equals("com.android.settings.USER_DICTIONARY_INSERT")) {
+            String word = getIntent().getStringExtra(EXTRA_WORD);
+            if (word != null) {
+                showAddOrEditDialog(word);
+            }
+        }
+    }
+    @Override
     protected void onRestoreInstanceState(Bundle state) {
         super.onRestoreInstanceState(state);
         mDialogEditingWord = state.getString(INSTANCE_KEY_DIALOG_EDITING_WORD);
@@ -207,7 +220,7 @@ public class UserDictionarySettings extends ListActivity {
         
         // TODO: present UI for picking whether to add word to all locales, or current.
         UserDictionary.Words.addWord(this, word.toString(),
-                1, UserDictionary.Words.LOCALE_TYPE_ALL);
+                128, UserDictionary.Words.LOCALE_TYPE_ALL);
         mCursor.requery();
     }
 
diff --git a/src/com/android/settings/battery_history/BatteryHistory.java b/src/com/android/settings/battery_history/BatteryHistory.java
new file mode 100644
index 0000000..19302a5
--- /dev/null
+++ b/src/com/android/settings/battery_history/BatteryHistory.java
@@ -0,0 +1,645 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.battery_history;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import com.android.internal.app.IBatteryStats;
+import com.android.settings.R;
+
+import android.app.Activity;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.BatteryStats;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemClock;
+import android.os.BatteryStats.Timer;
+import android.os.BatteryStats.Uid;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.AdapterView.OnItemSelectedListener;
+
+public class BatteryHistory extends Activity implements OnClickListener, OnItemSelectedListener {
+    private static final String TAG = "BatteryHistory";
+
+    private static final int SECONDS_PER_MINUTE = 60;
+    private static final int SECONDS_PER_HOUR = 60 * 60;
+    private static final int SECONDS_PER_DAY = 24 * 60 * 60;
+    
+    // Must be in sync with the values in res/values/array.xml (id battery_history_type_spinner)
+    private static final int CPU_USAGE = 0;
+    private static final int NETWORK_USAGE = 1;
+    private static final int SENSOR_USAGE = 2;
+    private static final int SCREEN_ON = 3;
+    private static final int WAKE_LOCKS = 4;
+
+    // App names to use as labels for the shared UIDs that contain them
+    private final HashSet<String> mKnownApps = new HashSet<String>();
+    
+    private BatteryStats mStats;
+    private int mWhich = BatteryStats.STATS_UNPLUGGED;
+    private int mType = CPU_USAGE;
+    
+    private GraphableButton[] mButtons;
+    IBatteryStats mBatteryInfo;
+    
+    private List<CpuUsage> mCpuUsage = new ArrayList<CpuUsage>();
+    private List<NetworkUsage> mNetworkUsage = new ArrayList<NetworkUsage>();
+    private List<SensorUsage> mSensorUsage = new ArrayList<SensorUsage>();
+    private long mScreenOnTime;
+    
+    private LinearLayout mGraphLayout;
+    private LinearLayout mTextLayout;
+    private TextView mMessageText;
+    private TextView mDetailsText;
+    private Button mDetailsBackButton;
+    private Spinner mTypeSpinner;
+    private Spinner mWhichSpinner;
+    
+    private boolean mDetailsShown = false;
+    
+    private static String getLabel(String packageName, PackageManager pm) {
+        try {
+            ApplicationInfo ai = pm.getApplicationInfo(packageName, 0);
+            CharSequence label = ai.loadLabel(pm);
+            if (label != null) {
+                return label.toString();
+            }
+        } catch (NameNotFoundException e) {
+            return packageName;
+        }
+        
+        return "";
+    }
+    
+    void formatTime(double millis, StringBuilder sb) {
+        int seconds = (int) Math.floor(millis / 1000);
+        
+        int days = 0, hours = 0, minutes = 0;
+        if (seconds > SECONDS_PER_DAY) {
+            days = seconds / SECONDS_PER_DAY;
+            seconds -= days * SECONDS_PER_DAY;
+        }
+        if (seconds > SECONDS_PER_HOUR) {
+            hours = seconds / SECONDS_PER_HOUR;
+            seconds -= hours * SECONDS_PER_HOUR;
+        }
+        if (seconds > SECONDS_PER_MINUTE) {
+            minutes = seconds / SECONDS_PER_MINUTE;
+            seconds -= minutes * SECONDS_PER_MINUTE;
+        }
+        if (days > 0) {
+            sb.append(getString(R.string.battery_history_days, days, hours, minutes, seconds));
+        } else if (hours > 0) {
+            sb.append(getString(R.string.battery_history_hours, hours, minutes, seconds));
+        } else if (minutes > 0) { 
+            sb.append(getString(R.string.battery_history_minutes, minutes, seconds));
+        } else {
+            sb.append(getString(R.string.battery_history_seconds, seconds));
+        }
+    }
+    
+    abstract class Graphable implements Comparable<Graphable> {        
+        protected String mName;
+        protected boolean mUniqueName;
+        protected String[] mPackageNames;
+        
+        public abstract String getLabel();
+        public abstract double getSortValue();
+        public abstract double[] getValues();
+        public abstract void getInfo(StringBuilder info);
+        
+        public int compareTo(Graphable o) {
+            double t = getSortValue();
+            double ot = o.getSortValue();
+            if (t < ot) {
+                // Largest first
+                return 1;
+            } else if (t > ot) {
+                return -1;
+            } else {
+                return 0;
+            }
+        }
+                
+        // Side effects: sets mName and mUniqueName
+        void getNameForUid(int uid) {
+            PackageManager pm = getPackageManager();
+            mPackageNames = pm.getPackagesForUid(uid);
+            // Convert package names to user-facing labels where possible
+            for (int i = 0; i < mPackageNames.length; i++) {
+                mPackageNames[i] = BatteryHistory.getLabel(mPackageNames[i], pm);
+            }
+
+            if (mPackageNames.length == 1) {
+                mName = mPackageNames[0];
+                mUniqueName = true;
+            } else {
+                mName = getString(R.string.battery_history_uid, uid); // Default name
+                // If one of the names for this UID is in mKnownApps, use it
+                for (String name : mPackageNames) {
+                    if (mKnownApps.contains(name)) {
+                        mName = name;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    class CpuUsage extends Graphable {
+        double[] mUsage;
+        long mStarts;
+        
+        public CpuUsage(String name, long userTime, long systemTime, long starts) {
+            PackageManager pm = BatteryHistory.this.getPackageManager();
+            mName = BatteryHistory.getLabel(name, pm);
+            mUsage = new double[2];
+            
+            mUsage[0] = userTime;
+            mUsage[1] = userTime + systemTime;
+            mStarts = starts;
+        }
+        
+        public String getLabel() {
+            return mName;
+        }
+        
+        public double getSortValue() {
+            return mUsage[1];
+        }
+        
+        public double[] getValues() {
+            return mUsage;
+        }
+        
+        public void getInfo(StringBuilder info) {
+            info.append(getString(R.string.battery_history_cpu_usage, mName));
+            info.append("\n\n");
+            info.append(getString(R.string.battery_history_user_time));
+            formatTime(mUsage[0] * 10, info);
+            info.append('\n');
+            info.append(getString(R.string.battery_history_system_time));
+            formatTime((mUsage[1] - mUsage[0]) * 10, info);
+            info.append('\n');
+            info.append(getString(R.string.battery_history_total_time));
+            formatTime((mUsage[1]) * 10, info);
+            info.append('\n');
+            info.append(getString(R.string.battery_history_starts, mStarts));
+        }
+    }
+    
+    class NetworkUsage extends Graphable {
+        double[] mUsage;
+        
+        public NetworkUsage(int uid, long received, long sent) {
+            getNameForUid(uid);
+            
+            mUsage = new double[2];
+            mUsage[0] = received;
+            mUsage[1] = received + sent;
+        }
+        
+        public String getLabel() {
+            return mName;
+        }
+        
+        public double getSortValue() {
+            return mUsage[1];
+        }
+        
+        public double[] getValues() {
+            return mUsage;
+        }
+        
+        public void getInfo(StringBuilder info) {
+            info.append(getString(R.string.battery_history_network_usage, mName));
+            info.append("\n\n");
+            info.append(getString(R.string.battery_history_bytes_received, (long) mUsage[0]));
+            info.append('\n');
+            info.append(getString(R.string.battery_history_bytes_sent,
+                    (long) mUsage[1] - (long) mUsage[0]));
+            info.append('\n');
+            info.append(getString(R.string.battery_history_bytes_total, (long) mUsage[1]));
+
+            if (!mUniqueName) {
+                info.append("\n\n");
+                info.append(getString(R.string.battery_history_packages_sharing_this_uid));
+                info.append('\n');
+
+                PackageManager pm = BatteryHistory.this.getPackageManager();
+                List<String> names = new ArrayList<String>();
+                for (String name : mPackageNames) {
+                    names.add(BatteryHistory.getLabel(name, pm));
+                }
+                Collections.sort(names);
+                for (String name : names) {
+                    info.append("    ");
+                    info.append(name);
+                    info.append('\n');
+                }
+            }
+        }
+    }
+    
+    class SensorUsage extends Graphable {
+        int mSensorNumber;
+        double[] mUsage;
+        HashMap<Integer,Integer> mCounts;
+        
+        public SensorUsage(int sensorNumber, String sensorName, long totalTime,
+                HashMap<Integer,Integer> counts) {
+            mName = sensorName;
+            mSensorNumber = sensorNumber;
+            
+            mUsage = new double[1];
+            mUsage[0] = totalTime;
+            
+            mCounts = counts;
+        }
+        
+        public String getLabel() {
+            return mName;
+        }
+        
+        public double getSortValue() {
+            return mUsage[0];
+        }
+        
+        public double[] getValues() {
+            return mUsage;
+        }
+        
+        public void getInfo(StringBuilder info) {
+            info.append(getString(R.string.battery_history_sensor));
+            info.append(mName);
+            info.append("\n\n");
+            info.append(getString(R.string.battery_history_total_time));
+            formatTime(mUsage[0], info);
+            info.append("\n\n");
+            
+            PackageManager pm = getPackageManager();
+            String[] packageNames = null;
+            for (Map.Entry<Integer,Integer> ent : mCounts.entrySet()) {
+                int uid = ent.getKey().intValue();
+                int count = ent.getValue().intValue();
+                packageNames = pm.getPackagesForUid(uid).clone();
+                
+                if (packageNames.length == 1) {
+                    info.append(getString(R.string.battery_history_sensor_usage,
+                            count, packageNames[0]));
+                } else {
+                    info.append(getString(R.string.battery_history_sensor_usage_multi, count));
+                    info.append("\n");
+                    // Convert package names to user-facing labels where possible
+                    for (int i = 0; i < packageNames.length; i++) {
+                        info.append("    ");
+                        info.append(BatteryHistory.getLabel(packageNames[i], pm));
+                        info.append("\n");
+                    }
+                }
+            }
+        }
+    }
+    
+    private List<? extends Graphable> getGraphRecords() {
+        switch (mType) {
+            case CPU_USAGE: return mCpuUsage;
+            case NETWORK_USAGE : return mNetworkUsage;
+            case SENSOR_USAGE: return mSensorUsage;
+            case SCREEN_ON: return null;
+            case WAKE_LOCKS:
+            default:
+                return (List<? extends Graphable>) null; // TODO
+        }
+    }
+    
+    private void displayScreenUsage() {
+        mMessageText.setVisibility(View.VISIBLE);
+        StringBuilder sb = new StringBuilder();
+        sb.append(getString(R.string.battery_history_screen_on));
+        sb.append("\n\n");
+        sb.append(getString(R.string.battery_history_screen_on_battery));
+        sb.append(' ');
+        formatTime((double) mStats.getBatteryScreenOnTime(), sb);
+        sb.append('\n');
+        sb.append(getString(R.string.battery_history_screen_on_plugged));
+        sb.append(' ');
+        formatTime((double) mStats.getPluggedScreenOnTime(), sb);
+        sb.append('\n');
+        mMessageText.setText(sb.toString());
+    }
+    
+    private void displayGraph() {
+        Log.i(TAG, "displayGraph");
+
+        // Hide the UI and selectively enable it below
+        mMessageText.setVisibility(View.GONE);
+        for (int i = 0; i < mButtons.length; i++) {
+            mButtons[i].setVisibility(View.INVISIBLE);
+        }
+        
+        if (mType == SCREEN_ON) {
+            displayScreenUsage();
+            return;
+        }
+        
+        double maxValue = -Double.MAX_VALUE;
+        
+        List<? extends Graphable> records = getGraphRecords();
+        for (Graphable g : records) {
+            double[] values = g.getValues();
+            maxValue = Math.max(maxValue, values[values.length - 1]);
+        }
+        
+        int[] colors = new int[2];
+        colors[0] = 0xff0000ff;
+        colors[1] = 0xffff0000;
+        
+        for (int i = 0; i < mButtons.length; i++) {
+            mButtons[i].setVisibility(View.INVISIBLE);
+        }
+        
+        int numRecords = Math.min(records.size(), mButtons.length);
+        if (numRecords == 0) {
+             mMessageText.setVisibility(View.VISIBLE);
+             mMessageText.setText(R.string.battery_history_no_data);
+        } else {
+            for (int i = 0; i < numRecords; i++) {
+                Graphable r = records.get(i);           
+
+                mButtons[i].setText(r.getLabel());
+                mButtons[i].setValues(r.getValues(), maxValue);
+                mButtons[i].setVisibility(View.VISIBLE);
+            }
+        }
+    }
+    
+    private void hideDetails() {
+        mTextLayout.setVisibility(View.GONE);
+        mGraphLayout.setVisibility(View.VISIBLE);
+        mDetailsShown = false;
+    }
+    
+    private void showDetails(int id) {
+        mGraphLayout.setVisibility(View.GONE);
+        mTextLayout.setVisibility(View.VISIBLE);
+            
+        StringBuilder info = new StringBuilder();
+        List<? extends Graphable> records = getGraphRecords();
+        if (id < records.size()) {
+            Graphable record = records.get(id);
+            record.getInfo(info);
+        } else {
+            info.append(getString(R.string.battery_history_details_for, id));
+        }
+        mDetailsText.setText(info.toString());
+        mDetailsShown = true;
+    }
+
+    private void processCpuUsage() {
+        mCpuUsage.clear();
+        
+        SparseArray<? extends Uid> uidStats = mStats.getUidStats();
+        final int NU = uidStats.size();
+        for (int iu = 0; iu < NU; iu++) {
+            Uid u = uidStats.valueAt(iu);
+
+            Map<String, ? extends BatteryStats.Uid.Proc> processStats = u.getProcessStats();
+            if (processStats.size() > 0) {
+                for (Map.Entry<String, ? extends BatteryStats.Uid.Proc> ent
+                        : processStats.entrySet()) {
+
+                    Uid.Proc ps = ent.getValue();
+                    long userTime = ps.getUserTime(mWhich);
+                    long systemTime = ps.getSystemTime(mWhich);
+                    long starts = ps.getStarts(mWhich);
+
+                    if (userTime != 0 || systemTime != 0) {
+                        mCpuUsage.add(new CpuUsage(ent.getKey(), userTime, systemTime, starts));
+                    }
+                }
+            }
+        }
+        Collections.sort(mCpuUsage);
+    }
+    
+    private void processNetworkUsage() {
+        mNetworkUsage.clear();
+        
+        SparseArray<? extends Uid> uidStats = mStats.getUidStats();
+        final int NU = uidStats.size();
+        for (int iu = 0; iu < NU; iu++) {
+            Uid u = uidStats.valueAt(iu);
+            
+            long received = u.getTcpBytesReceived(mWhich);
+            long sent = u.getTcpBytesSent(mWhich);
+            if (received + sent > 0) {
+                mNetworkUsage.add(new NetworkUsage(u.getUid(), received, sent));
+            }
+        }
+        Collections.sort(mNetworkUsage);
+    }
+    
+    class SensorRecord {
+        String name;
+        long totalTime;
+        HashMap<Integer,Integer> counts = new HashMap<Integer,Integer>();
+    }
+    
+    private void processSensorUsage() {
+        mSensorUsage.clear();
+        
+        HashMap<Integer,SensorRecord> records = new HashMap<Integer,SensorRecord>();
+        
+        long uSecTime = SystemClock.elapsedRealtime() * 1000;
+        final long uSecNow = mStats.getBatteryUptime(uSecTime);
+        
+        SparseArray<? extends Uid> uidStats = mStats.getUidStats();
+        final int NU = uidStats.size();
+        for (int iu = 0; iu < NU; iu++) {
+            Uid u = uidStats.valueAt(iu);
+            int uid = u.getUid();
+            
+            Map<Integer, ? extends BatteryStats.Uid.Sensor> sensorStats = u.getSensorStats();
+            if (sensorStats.size() > 0) {
+                for (Map.Entry<Integer, ? extends BatteryStats.Uid.Sensor> ent
+                        : sensorStats.entrySet()) {
+
+                    Uid.Sensor se = ent.getValue();
+                    String name = se.getName();
+                    int sensorNumber = ent.getKey();
+                    Timer timer = se.getSensorTime();
+                    if (timer != null) {
+                        // Convert from microseconds to milliseconds with rounding
+                        long totalTime = (timer.getTotalTime(uSecNow, mWhich) + 500) / 1000;
+                        int count = timer.getCount(mWhich);
+                        
+                        SensorRecord record = records.get(sensorNumber);
+                        if (record == null) {
+                            record = new SensorRecord();
+                        }
+                        record.name = name;
+                        record.totalTime += totalTime;
+                        Integer c = record.counts.get(uid);
+                        if (c == null) {
+                            record.counts.put(uid, count);
+                        } else {
+                            record.counts.put(uid, c.intValue() + count);
+                        }
+                        records.put(sensorNumber, record);
+                    }
+                }
+            }
+        }
+        
+        for (Map.Entry<Integer,SensorRecord> record : records.entrySet()) {
+            int sensorNumber = record.getKey().intValue();
+            SensorRecord r = record.getValue();
+            mSensorUsage.add(new SensorUsage(sensorNumber, r.name, r.totalTime, r.counts));
+        }
+        Collections.sort(mSensorUsage);
+    }
+    
+    private void processScreenOn() {
+        // Do nothing
+    }
+    
+    private void collectStatistics() {
+        processCpuUsage();
+        processNetworkUsage();
+        processSensorUsage();
+        processScreenOn();
+    }
+    
+    private void refresh() {
+        try {
+            mStats = mBatteryInfo.getStatistics();
+            collectStatistics();
+            displayGraph();
+        } catch (RemoteException e) {
+            Log.e(TAG, "RemoteException:", e);
+        }
+    }
+    
+    public void onClick(View v) {
+        if (v == mDetailsBackButton) {
+            hideDetails();
+            return;
+        }
+        
+        int id = ((Integer) v.getTag()).intValue();
+        showDetails(id);
+    }
+    
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK && mDetailsShown) {
+            hideDetails();
+            return true;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+        if (parent.equals(mTypeSpinner)) {
+            mType = position;
+            switch (position) {
+                case CPU_USAGE:
+                    mWhichSpinner.setEnabled(true);
+                    break;
+                case NETWORK_USAGE:
+                    mWhichSpinner.setEnabled(true);
+                    break;
+                case SENSOR_USAGE:
+                    mWhichSpinner.setEnabled(true);
+                    break;
+                case SCREEN_ON:
+                    mWhichSpinner.setEnabled(false);
+                    break;
+                case WAKE_LOCKS:
+                    break;
+            }
+        } else if (parent.equals(mWhichSpinner)) {
+            mWhich = position;
+        }
+        
+        refresh();
+    }
+
+    public void onNothingSelected(AdapterView<?> parent) {
+        // Do nothing
+    }
+    
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        Log.i(TAG, "onCreate");
+        
+        String knownApps = getString(R.string.battery_history_known_apps);
+        String[] knownAppNames = knownApps.split(";");
+        for (String name : knownAppNames) {
+            mKnownApps.add(name);
+        }
+        
+        setContentView(R.layout.battery_history);
+        
+        mGraphLayout = (LinearLayout) findViewById(R.id.graphLayout);
+        mTextLayout = (LinearLayout) findViewById(R.id.textLayout);
+        mDetailsText = (TextView) findViewById(R.id.detailsText);
+        mMessageText = (TextView) findViewById(R.id.messageText);
+        
+        mTypeSpinner = (Spinner) findViewById(R.id.typeSpinner);
+        mTypeSpinner.setOnItemSelectedListener(this);
+        
+        mWhichSpinner = (Spinner) findViewById(R.id.whichSpinner);
+        mWhichSpinner.setOnItemSelectedListener(this);
+        
+        mButtons = new GraphableButton[8];
+        mButtons[0] = (GraphableButton) findViewById(R.id.button0);
+        mButtons[1] = (GraphableButton) findViewById(R.id.button1);
+        mButtons[2] = (GraphableButton) findViewById(R.id.button2);
+        mButtons[3] = (GraphableButton) findViewById(R.id.button3);
+        mButtons[4] = (GraphableButton) findViewById(R.id.button4);
+        mButtons[5] = (GraphableButton) findViewById(R.id.button5);
+        mButtons[6] = (GraphableButton) findViewById(R.id.button6);
+        mButtons[7] = (GraphableButton) findViewById(R.id.button7);
+        
+        for (int i = 0; i < mButtons.length; i++) {
+            mButtons[i].setTag(i);
+            mButtons[i].setOnClickListener(this);
+        }
+        
+        mBatteryInfo = IBatteryStats.Stub.asInterface(ServiceManager.getService("batteryinfo"));
+        refresh();
+    }
+}
diff --git a/src/com/android/settings/battery_history/GraphableButton.java b/src/com/android/settings/battery_history/GraphableButton.java
new file mode 100644
index 0000000..39028d0
--- /dev/null
+++ b/src/com/android/settings/battery_history/GraphableButton.java
@@ -0,0 +1,55 @@
+package com.android.settings.battery_history;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.widget.Button;
+
+public class GraphableButton extends Button {
+    private static final String TAG = "GraphableButton";
+
+    static Paint[] sPaint = new Paint[2];
+    static {
+        sPaint[0] = new Paint();
+        sPaint[0].setStyle(Paint.Style.FILL);
+        sPaint[0].setColor(Color.BLUE);
+        
+        sPaint[1] = new Paint();
+        sPaint[1].setStyle(Paint.Style.FILL);
+        sPaint[1].setColor(Color.RED);
+    }
+    
+    double[] mValues;
+    
+    public GraphableButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+    
+    public void setValues(double[] values, double maxValue) {
+        mValues = values.clone();
+        for (int i = 0; i < values.length; i++) {
+            mValues[i] /= maxValue;
+        }
+    }
+    
+    @Override
+    public void onDraw(Canvas canvas) {
+        Log.i(TAG, "onDraw: w = " + getWidth() + ", h = " + getHeight());
+        
+        int xmin = getPaddingLeft();
+        int xmax = getWidth() - getPaddingRight();
+        int ymin = getPaddingTop();
+        int ymax = getHeight() - getPaddingBottom();
+        
+        int startx = xmin;
+        for (int i = 0; i < mValues.length; i++) {
+            int endx = xmin + (int) (mValues[i] * (xmax - xmin));
+            canvas.drawRect(startx, ymin, endx, ymax, sPaint[i]);
+            startx = endx;
+        }
+        super.onDraw(canvas);
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
index facb763..a51f9b5 100644
--- a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
@@ -19,6 +19,7 @@ package com.android.settings.bluetooth;
 import com.android.settings.R;
 
 import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothError;
 import android.bluetooth.BluetoothIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -56,14 +57,12 @@ public class BluetoothDiscoverableEnabler implements Preference.OnPreferenceChan
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            /*
-             * TODO: remove this once the BT framework broadcasts the
-             * MODE_CHANGED action when going into MODE_OFF.
-             */
-            int mode = BluetoothIntent.DISABLED_ACTION.equals(intent.getAction())
-                    ? BluetoothDevice.MODE_OFF                    
-                    : intent.getIntExtra(BluetoothIntent.MODE, BluetoothDevice.MODE_UNKNOWN);
-            handleModeChanged(mode);
+            if (BluetoothIntent.SCAN_MODE_CHANGED_ACTION.equals(intent.getAction())) {
+                int mode = intent.getIntExtra(BluetoothIntent.SCAN_MODE, BluetoothError.ERROR);
+                if (mode != BluetoothError.ERROR) {
+                    handleModeChanged(mode);
+                }
+            }
         }
     };
 
@@ -92,12 +91,12 @@ public class BluetoothDiscoverableEnabler implements Preference.OnPreferenceChan
             return;
         }
 
-        IntentFilter filter = new IntentFilter(BluetoothIntent.MODE_CHANGED_ACTION);
+        IntentFilter filter = new IntentFilter(BluetoothIntent.SCAN_MODE_CHANGED_ACTION);
         filter.addAction(BluetoothIntent.DISABLED_ACTION);
         mContext.registerReceiver(mReceiver, filter);
         mCheckBoxPreference.setOnPreferenceChangeListener(this);
         
-        handleModeChanged(mLocalManager.getBluetoothManager().getMode());
+        handleModeChanged(mLocalManager.getBluetoothManager().getScanMode());
     }
     
     public void pause() {
@@ -132,11 +131,9 @@ public class BluetoothDiscoverableEnabler implements Preference.OnPreferenceChan
             long endTimestamp = System.currentTimeMillis() + timeout * 1000;
             persistDiscoverableEndTimestamp(endTimestamp);
             
-            manager.setMode(BluetoothDevice.MODE_DISCOVERABLE);
-            handleModeChanged(BluetoothDevice.MODE_DISCOVERABLE);            
-            
+            manager.setScanMode(BluetoothDevice.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
         } else {
-            manager.setMode(BluetoothDevice.MODE_CONNECTABLE);
+            manager.setScanMode(BluetoothDevice.SCAN_MODE_CONNECTABLE);
         }
     }
 
@@ -160,7 +157,7 @@ public class BluetoothDiscoverableEnabler implements Preference.OnPreferenceChan
             Log.v(TAG, "Got mode changed: " + mode);
         }
         
-        if (mode == BluetoothDevice.MODE_DISCOVERABLE) {
+        if (mode == BluetoothDevice.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
             mCheckBoxPreference.setChecked(true);
             updateCountdownSummary();
             
@@ -170,8 +167,8 @@ public class BluetoothDiscoverableEnabler implements Preference.OnPreferenceChan
     }
     
     private void updateCountdownSummary() {
-        int mode = mLocalManager.getBluetoothManager().getMode();
-        if (mode != BluetoothDevice.MODE_DISCOVERABLE) {
+        int mode = mLocalManager.getBluetoothManager().getScanMode();
+        if (mode != BluetoothDevice.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
             return;
         }
             
diff --git a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java b/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
index fe64d13..a588013 100644
--- a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
+++ b/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
@@ -52,31 +52,39 @@ public class BluetoothEventRedirector {
                 
             if (action.equals(BluetoothIntent.ENABLED_ACTION)) {
                 mManager.setBluetoothStateInt(ExtendedBluetoothState.ENABLED);
+                
             } else if (action.equals(BluetoothIntent.DISABLED_ACTION)) {
                 mManager.setBluetoothStateInt(ExtendedBluetoothState.DISABLED);
                     
             } else if (action.equals(BluetoothIntent.DISCOVERY_STARTED_ACTION)) {
                 mManager.onScanningStateChanged(true);
+                
             } else if (action.equals(BluetoothIntent.DISCOVERY_COMPLETED_ACTION)) {
                 mManager.onScanningStateChanged(false);
                     
             } else if (action.equals(BluetoothIntent.REMOTE_DEVICE_FOUND_ACTION)) {
                 short rssi = intent.getShortExtra(BluetoothIntent.RSSI, Short.MIN_VALUE);
                 mManager.getLocalDeviceManager().onDeviceAppeared(address, rssi);
+                
             } else if (action.equals(BluetoothIntent.REMOTE_DEVICE_DISAPPEARED_ACTION)) {
                 mManager.getLocalDeviceManager().onDeviceDisappeared(address);
+                
             } else if (action.equals(BluetoothIntent.REMOTE_NAME_UPDATED_ACTION)) {
                 mManager.getLocalDeviceManager().onDeviceNameUpdated(address);
+                
             } else if (action.equals(BluetoothIntent.BOND_STATE_CHANGED_ACTION)) {
                 int bondState = intent.getIntExtra(BluetoothIntent.BOND_STATE,
                                                    BluetoothError.ERROR);
                 mManager.getLocalDeviceManager().onBondingStateChanged(address, bondState);
                 if (bondState == BluetoothDevice.BOND_NOT_BONDED) {
                     int reason = intent.getIntExtra(BluetoothIntent.REASON, BluetoothError.ERROR);
-                    Log.w(TAG, address + " unbonded with reason " + reason +
-                          ", TODO: handle this nicely in the UI");  //TODO
-                    mManager.getLocalDeviceManager().onBondingError(address);
+                    if (reason == BluetoothDevice.UNBOND_REASON_AUTH_FAILED ||
+                            reason == BluetoothDevice.UNBOND_REASON_AUTH_REJECTED ||
+                            reason == BluetoothDevice.UNBOND_REASON_REMOTE_DEVICE_DOWN) {
+                        mManager.getLocalDeviceManager().onBondingError(address, reason);
+                    }
                 }
+                
             } else if (action.equals(BluetoothIntent.HEADSET_STATE_CHANGED_ACTION)) {
                 mManager.getLocalDeviceManager().onProfileStateChanged(address);
 
@@ -96,6 +104,10 @@ public class BluetoothEventRedirector {
                         oldState == BluetoothA2dp.STATE_CONNECTING) {
                     mManager.getLocalDeviceManager().onConnectingError(address);
                 }
+                
+            } else if (action.equals(BluetoothIntent.REMOTE_DEVICE_CLASS_UPDATED_ACTION)) {
+                mManager.getLocalDeviceManager().onBtClassChanged(address);
+                
             }
         }
     };
@@ -124,6 +136,7 @@ public class BluetoothEventRedirector {
         // Fine-grained state broadcasts
         filter.addAction(BluetoothA2dp.SINK_STATE_CHANGED_ACTION);
         filter.addAction(BluetoothIntent.HEADSET_STATE_CHANGED_ACTION);
+        filter.addAction(BluetoothIntent.REMOTE_DEVICE_CLASS_UPDATED_ACTION);
         
         mManager.getContext().registerReceiver(mBroadcastReceiver, filter);
     }
diff --git a/src/com/android/settings/bluetooth/BluetoothPinDialog.java b/src/com/android/settings/bluetooth/BluetoothPinDialog.java
index 291d0c1..a8e7737 100644
--- a/src/com/android/settings/bluetooth/BluetoothPinDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPinDialog.java
@@ -18,13 +18,19 @@ package com.android.settings.bluetooth;
 
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.os.Bundle;
+import android.text.Editable;
 import android.text.InputFilter;
-import android.text.method.DigitsKeyListener;
+import android.text.TextWatcher;
+import android.text.InputFilter.LengthFilter;
 import android.util.Log;
 import android.view.View;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -36,12 +42,31 @@ import com.android.settings.R;
  * BluetoothPinDialog asks the user to enter a PIN for pairing with a remote
  * Bluetooth device. It is an activity that appears as a dialog.
  */
-public class BluetoothPinDialog extends AlertActivity implements DialogInterface.OnClickListener {
+public class BluetoothPinDialog extends AlertActivity implements DialogInterface.OnClickListener,
+        TextWatcher {
     private static final String TAG = "BluetoothPinDialog";
 
     private LocalBluetoothManager mLocalManager;
     private String mAddress;
     private EditText mPinView;
+    private Button mOkButton;
+
+    private static final String INSTANCE_KEY_PAIRING_CANCELED = "received_pairing_canceled";
+    private boolean mReceivedPairingCanceled;
+    
+    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (!BluetoothIntent.PAIRING_CANCEL_ACTION.equals(intent.getAction())) {
+                return;
+            }
+            
+            String address = intent.getStringExtra(BluetoothIntent.ADDRESS);
+            if (address == null || address.equals(mAddress)) {
+                onReceivedPairingCanceled();
+            }
+        }
+    };
     
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -69,6 +94,39 @@ public class BluetoothPinDialog extends AlertActivity implements DialogInterface
         p.mNegativeButtonText = getString(android.R.string.cancel);
         p.mNegativeButtonListener = this;
         setupAlert();
+        
+        mOkButton = mAlert.getButton(DialogInterface.BUTTON_POSITIVE);
+        mOkButton.setEnabled(false);
+
+        /*
+         * Leave this registered through pause/resume since we still want to
+         * finish the activity in the background if pairing is canceled.
+         */
+        registerReceiver(mReceiver, new IntentFilter(BluetoothIntent.PAIRING_CANCEL_ACTION));
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        
+        mReceivedPairingCanceled = savedInstanceState.getBoolean(INSTANCE_KEY_PAIRING_CANCELED);
+        if (mReceivedPairingCanceled) {
+            onReceivedPairingCanceled();
+        }
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        
+        outState.putBoolean(INSTANCE_KEY_PAIRING_CANCELED, mReceivedPairingCanceled);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        
+        unregisterReceiver(mReceiver);
     }
 
     private View createView() {
@@ -79,9 +137,32 @@ public class BluetoothPinDialog extends AlertActivity implements DialogInterface
         messageView.setText(getString(R.string.bluetooth_enter_pin_msg, name));
         
         mPinView = (EditText) view.findViewById(R.id.text);
+        mPinView.addTextChangedListener(this);
+        // Maximum of 10 characters in a PIN
+        mPinView.setFilters(new InputFilter[] { new LengthFilter(10) });
         
         return view;
     }
+
+    public void afterTextChanged(Editable s) {
+        if (s.length() > 0) {
+            mOkButton.setEnabled(true);
+        }
+    }
+
+    private void onReceivedPairingCanceled() {
+        mReceivedPairingCanceled = true;
+        
+        TextView messageView = (TextView) findViewById(R.id.message);
+        messageView.setText(getString(R.string.bluetooth_pairing_error_message,
+                mLocalManager.getLocalDeviceManager().getName(mAddress)));
+        
+        mPinView.setEnabled(false);
+        mPinView.clearFocus();
+        mPinView.removeTextChangedListener(this);
+        
+        mAlert.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(false);
+    }
     
     private void onPair(String pin) {
         byte[] pinBytes = BluetoothDevice.convertPinToBytes(pin);
@@ -94,7 +175,7 @@ public class BluetoothPinDialog extends AlertActivity implements DialogInterface
     }
 
     private void onCancel() {
-        mLocalManager.getBluetoothManager().cancelPin(mAddress);
+        mLocalManager.getBluetoothManager().cancelBondProcess(mAddress);
     }
     
     public void onClick(DialogInterface dialog, int which) {
@@ -109,4 +190,12 @@ public class BluetoothPinDialog extends AlertActivity implements DialogInterface
         }
     }
 
+    /* Not used */
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+    }
+
+    /* Not used */
+    public void onTextChanged(CharSequence s, int start, int before, int count) {
+    }
+
 }
diff --git a/src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java b/src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java
index 23a43bd..f2f3bdf 100644
--- a/src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java
+++ b/src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java
@@ -25,10 +25,7 @@ import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceGroup;
-import android.preference.PreferenceScreen;
 import android.text.TextUtils;
-import android.widget.ImageView;
-import android.widget.TextView;
 import android.util.Log;
 
 /**
@@ -114,7 +111,7 @@ public class ConnectSpecificProfilesActivity extends PreferenceActivity
         mManager.setForegroundActivity(this);
         mDevice.registerCallback(this);
 
-        refresh(true);
+        refresh();
     }
 
     @Override
@@ -169,7 +166,7 @@ public class ConnectSpecificProfilesActivity extends PreferenceActivity
     }
 
     private void onOnlineModeCheckedStateChanged(boolean checked) {
-        switchModes(checked, false);
+        setOnlineMode(checked, true);
     }
     
     private void onProfileCheckedStateChanged(Profile profile, boolean checked) {
@@ -187,39 +184,34 @@ public class ConnectSpecificProfilesActivity extends PreferenceActivity
     }
     
     public void onDeviceAttributesChanged(LocalBluetoothDevice device) {
-        refresh(false);
+        refresh();
     }
 
-    private void refresh(boolean forceRefresh) {
-        // The online mode could have changed
-        updateOnlineMode(forceRefresh);
+    private void refresh() {
+        // We are in 'online mode' if we are connected, connecting, or disconnecting
+        setOnlineMode(mDevice.isConnected() || mDevice.isBusy(), false);
         refreshProfiles();
-        refreshOnlineModePreference();
     }
 
-    private void updateOnlineMode(boolean force) {
-        // Connected or Connecting (and Disconnecting, which is fine)
-        boolean onlineMode = mDevice.isConnected() || mDevice.isBusy();
-        switchModes(onlineMode, force);
-    }
-    
     /**
      * Switches between online/offline mode.
      * 
      * @param onlineMode Whether to be in online mode, or offline mode.
+     * @param takeAction Whether to take action (i.e., connect or disconnect)
+     *            based on the new online mode.
      */
-    private void switchModes(boolean onlineMode, boolean force) {
-        if (mOnlineMode != onlineMode || force) {
-            mOnlineMode = onlineMode;
+    private void setOnlineMode(boolean onlineMode, boolean takeAction) {
+        mOnlineMode = onlineMode;
             
+        if (takeAction) {
             if (onlineMode) {
                 mDevice.connect();
             } else {
                 mDevice.disconnect();
             }
-
-            refreshOnlineModePreference();
         }
+            
+        refreshOnlineModePreference();
     }
     
     private void refreshOnlineModePreference() {
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothDevice.java b/src/com/android/settings/bluetooth/LocalBluetoothDevice.java
index 26ddbf2..009ba5e 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothDevice.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothDevice.java
@@ -60,8 +60,6 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
     
     private boolean mVisible;
     
-    private int mBondState;
-    
     private final LocalBluetoothManager mLocalManager;
     
     private List<Callback> mCallbacks = new ArrayList<Callback>();
@@ -144,6 +142,9 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
     public void connect() {
         if (!ensurePaired()) return;
         
+        // Reset the only-show-one-error-dialog tracking variable
+        mIsConnectingErrorPossible = true;
+
         Context context = mLocalManager.getContext();
         boolean hasAtLeastOnePreferredProfile = false;
         for (Profile profile : mProfiles) {
@@ -151,7 +152,7 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
                     LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile);
             if (profileManager.isPreferred(mAddress)) {
                 hasAtLeastOnePreferredProfile = true;
-                connect(profile);
+                connectInt(profile);
             }
         }
         
@@ -163,23 +164,31 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
     private void connectAndPreferAllProfiles() {
         if (!ensurePaired()) return;
         
+        // Reset the only-show-one-error-dialog tracking variable
+        mIsConnectingErrorPossible = true;
+        
         Context context = mLocalManager.getContext();
         for (Profile profile : mProfiles) {
             LocalBluetoothProfileManager profileManager =
                     LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile);
             profileManager.setPreferred(mAddress, true);
-            connect(profile);
+            connectInt(profile);
         }
     }
     
     public void connect(Profile profile) {
+        // Reset the only-show-one-error-dialog tracking variable
+        mIsConnectingErrorPossible = true;
+        connectInt(profile);
+    }
+    
+    public void connectInt(Profile profile) {
         if (!ensurePaired()) return;
         
         LocalBluetoothProfileManager profileManager =
                 LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile); 
         int status = profileManager.getConnectionStatus(mAddress);
         if (!SettingsBtStatus.isConnectionStatusConnected(status)) {
-            mIsConnectingErrorPossible = true;
             if (profileManager.connect(mAddress) != BluetoothDevice.RESULT_SUCCESS) {
                 showConnectingError();
             }
@@ -211,9 +220,9 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
             manager.cancelDiscovery();
         }
 
-        if (mLocalManager.createBonding(mAddress)) {
-            //TODO: consider removing this line - UI will update through Intent
-            setBondState(BluetoothDevice.BOND_BONDING);
+        if (!mLocalManager.getBluetoothManager().createBond(mAddress)) {
+            mLocalManager.showError(mAddress, R.string.bluetooth_error_title,
+                    R.string.bluetooth_pairing_error_message);
         }
     }
 
@@ -235,11 +244,7 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
         BluetoothDevice manager = mLocalManager.getBluetoothManager();
 
         fetchName();
-        mBtClass = manager.getRemoteClass(mAddress);
-
-        LocalBluetoothProfileManager.fill(mBtClass, mProfiles);
-
-        mBondState = manager.getBondState(mAddress);
+        fetchBtClass();
 
         mVisible = false;
 
@@ -283,14 +288,7 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
     }
 
     public int getBondState() {
-        return mBondState;
-    }
-
-    void setBondState(int bondState) {
-        if (mBondState != bondState) {
-            mBondState = bondState;
-            dispatchAttributesChanged();
-        }
+        return mLocalManager.getBluetoothManager().getBondState(mAddress);
     }
 
     void setRssi(short rssi) {
@@ -355,6 +353,24 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
         }
     }
 
+    /**
+     * Fetches a new value for the cached BT class.
+     */
+    private void fetchBtClass() {
+        mBtClass = mLocalManager.getBluetoothManager().getRemoteClass(mAddress);
+        mProfiles.clear();
+        LocalBluetoothProfileManager.fill(mBtClass, mProfiles);
+    }
+
+    /**
+     * Refreshes the UI for the BT class, including fetching the latest value
+     * for the class.
+     */
+    public void refreshBtClass() {
+        fetchBtClass();
+        dispatchAttributesChanged();
+    }
+    
     public int getSummary() {
         // TODO: clean up
         int oneOffSummary = getOneOffSummary();
@@ -425,17 +441,15 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
         // No context menu if it is busy (none of these items are applicable if busy)
         if (isBusy()) return;
         
-        // No context menu if there are no profiles
-        if (mProfiles.size() == 0) return;
-        
         int bondState = getBondState();
         boolean isConnected = isConnected();
+        boolean hasProfiles = mProfiles.size() > 0;
         
         menu.setHeaderTitle(getName());
         
         if (isConnected) {
             menu.add(0, CONTEXT_ITEM_DISCONNECT, 0, R.string.bluetooth_device_context_disconnect);
-        } else {
+        } else if (hasProfiles) {
             // For connection action, show either "Connect" or "Pair & connect"
             int connectString = (bondState == BluetoothDevice.BOND_NOT_BONDED)
                     ? R.string.bluetooth_device_context_pair_connect
@@ -538,8 +552,8 @@ public class LocalBluetoothDevice implements Comparable<LocalBluetoothDevice> {
         if (comparison != 0) return comparison;
         
         // Paired above not paired
-        comparison = (another.mBondState == BluetoothDevice.BOND_BONDED ? 1 : 0) -
-            (mBondState == BluetoothDevice.BOND_BONDED ? 1 : 0);
+        comparison = (another.getBondState() == BluetoothDevice.BOND_BONDED ? 1 : 0) -
+            (getBondState() == BluetoothDevice.BOND_BONDED ? 1 : 0);
         if (comparison != 0) return comparison;
 
         // Visible above not visible
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothDeviceManager.java b/src/com/android/settings/bluetooth/LocalBluetoothDeviceManager.java
index a751656..6bb2b4a 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothDeviceManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothDeviceManager.java
@@ -45,19 +45,23 @@ public class LocalBluetoothDeviceManager {
         readPairedDevices();
     }
 
-    private synchronized void readPairedDevices() {
+    private synchronized boolean readPairedDevices() {
         BluetoothDevice manager = mLocalManager.getBluetoothManager();
         String[] bondedAddresses = manager.listBonds();
-        if (bondedAddresses == null) return;
+        if (bondedAddresses == null) return false;
         
+        boolean deviceAdded = false;
         for (String address : bondedAddresses) {
             LocalBluetoothDevice device = findDevice(address);
             if (device == null) {
                 device = new LocalBluetoothDevice(mLocalManager.getContext(), address);
                 mDevices.add(device);
-                dispatchDeviceAdded(device);                
+                dispatchDeviceAdded(device);
+                deviceAdded = true;
             }
         }
+        
+        return deviceAdded;
     }
     
     public synchronized List<LocalBluetoothDevice> getDevicesCopy() {
@@ -157,23 +161,33 @@ public class LocalBluetoothDeviceManager {
     public synchronized void onBondingStateChanged(String address, int bondState) {
         LocalBluetoothDevice device = findDevice(address);
         if (device == null) {
-            Log.e(TAG, "Got bonding state changed for " + address +
-                    ", but we have no record of that device.");
+            if (!readPairedDevices()) {
+                Log.e(TAG, "Got bonding state changed for " + address +
+                        ", but we have no record of that device.");
+            }
             return;
         }
 
-        device.setBondState(bondState);  //TODO: might be unecessary
-        checkForDeviceRemoval(device);
+        device.refresh();
 
         if (bondState == BluetoothDevice.BOND_BONDED) {
             // Auto-connect after pairing
             device.connect();
         }
     }
-    
-    public synchronized void onBondingError(String address) {
+
+    /**
+     * Called when there is a bonding error.
+     * 
+     * @param address The address of the remote device.
+     * @param reason The reason, one of the error reasons from
+     *            BluetoothDevice.UNBOND_REASON_*
+     */
+    public synchronized void onBondingError(String address, int reason) {
         mLocalManager.showError(address, R.string.bluetooth_error_title,
-                R.string.bluetooth_pairing_error_message);
+                (reason == BluetoothDevice.UNBOND_REASON_AUTH_FAILED) ?
+                        R.string.bluetooth_pairing_pin_error_message :
+                        R.string.bluetooth_pairing_error_message);
     }
     
     public synchronized void onProfileStateChanged(String address) {
@@ -205,4 +219,11 @@ public class LocalBluetoothDeviceManager {
             checkForDeviceRemoval(device);
         }
     }
+    
+    public synchronized void onBtClassChanged(String address) {
+        LocalBluetoothDevice device = findDevice(address);
+        if (device != null) {
+            device.refreshBtClass();
+        }
+    }
 }
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothManager.java b/src/com/android/settings/bluetooth/LocalBluetoothManager.java
index f8275b5..4fd708e 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothManager.java
@@ -226,10 +226,6 @@ public class LocalBluetoothManager {
         }
     }
 
-    public boolean createBonding(String address) {
-        return mManager.createBond(address);
-    }
-    
     public void showError(String address, int titleResId, int messageResId) {
         LocalBluetoothDevice device = mLocalDeviceManager.findDevice(address);
         if (device == null) return;
diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
index 86e6423..adfe88c 100644
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java
@@ -48,11 +48,13 @@ public class Memory extends PreferenceActivity {
 
     private static final String MEMORY_SD_UNMOUNT = "memory_sd_unmount";
 
+    private static final String MEMORY_SD_FORMAT = "memory_sd_format";
     private Resources mRes;
 
     private Preference mSdSize;
     private Preference mSdAvail;
     private Preference mSdUnmount;
+    private Preference mSdFormat;
     
     // Access using getMountService()
     private IMountService mMountService = null;
@@ -67,6 +69,7 @@ public class Memory extends PreferenceActivity {
         mSdSize = findPreference(MEMORY_SD_SIZE);
         mSdAvail = findPreference(MEMORY_SD_AVAIL);
         mSdUnmount = findPreference(MEMORY_SD_UNMOUNT);
+        mSdFormat = findPreference(MEMORY_SD_FORMAT);
     }
     
     @Override
@@ -109,6 +112,11 @@ public class Memory extends PreferenceActivity {
         if (preference == mSdUnmount) {
             unmount();
             return true;
+        } else if (preference == mSdFormat) {
+            Intent intent = new Intent(Intent.ACTION_VIEW);
+            intent.setClass(this, com.android.settings.MediaFormat.class);
+            startActivity(intent);
+            return true;
         }
         
         return false;
@@ -134,7 +142,7 @@ public class Memory extends PreferenceActivity {
             updateMemoryStatus();
         }
     }
-    
+
     private void updateMemoryStatus() {
         String status = Environment.getExternalStorageState();
         String readOnly = "";
@@ -143,6 +151,8 @@ public class Memory extends PreferenceActivity {
             readOnly = mRes.getString(R.string.read_only);
         }
  
+        mSdFormat.setEnabled(false);
+
         if (status.equals(Environment.MEDIA_MOUNTED)) {
             try {
                 File path = Environment.getExternalStorageDirectory();
@@ -164,6 +174,14 @@ public class Memory extends PreferenceActivity {
             mSdSize.setSummary(mRes.getString(R.string.sd_unavailable));
             mSdAvail.setSummary(mRes.getString(R.string.sd_unavailable));
             mSdUnmount.setEnabled(false);
+
+            if (status.equals(Environment.MEDIA_UNMOUNTED) ||
+                status.equals(Environment.MEDIA_NOFS) ||
+                status.equals(Environment.MEDIA_UNMOUNTABLE) ) {
+                mSdFormat.setEnabled(true);
+            }
+
+            
         }
 
         File path = Environment.getDataDirectory();
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index b7aceb1..98aa12b 100644
--- a/src/com/android/settings/deviceinfo/Status.java
+++ b/src/com/android/settings/deviceinfo/Status.java
@@ -30,6 +30,7 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.SystemClock;
 import android.os.SystemProperties;
+import android.os.NetStat;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.telephony.PhoneStateListener;
@@ -64,10 +65,11 @@ public class Status extends PreferenceActivity {
 
     private static final String KEY_WIFI_MAC_ADDRESS = "wifi_mac_address";
     private static final String KEY_BT_ADDRESS = "bt_address";
+    private static final String KEY_NETWORK_TRAFFIC_STATS = "network_traffic_stats";
     private static final int EVENT_SIGNAL_STRENGTH_CHANGED = 200;
     private static final int EVENT_SERVICE_STATE_CHANGED = 300;
-    
-    private static final int EVENT_FIX_UPTIME = 500;
+
+    private static final int EVENT_UPDATE_STATS = 500;
 
     private TelephonyManager mTelephonyManager;
     private Phone mPhone = null;
@@ -108,9 +110,10 @@ public class Status extends PreferenceActivity {
                     status.updateServiceState(serviceState);
                     break;
 
-                case EVENT_FIX_UPTIME:
+                case EVENT_UPDATE_STATS:
                     status.updateTimes();
-                    sendMessageDelayed(obtainMessage(EVENT_FIX_UPTIME), 1000);
+                    status.setNetworkTrafficStats();
+                    sendEmptyMessageDelayed(EVENT_UPDATE_STATS, 1000);
                     break;
             }
         }
@@ -196,7 +199,7 @@ public class Status extends PreferenceActivity {
         
         setWifiStatus();
         setBtStatus();
-    }   
+    }
     
     @Override
     protected void onResume() {
@@ -212,7 +215,7 @@ public class Status extends PreferenceActivity {
         mTelephonyManager.listen(mPhoneStateListener,
                   PhoneStateListener.LISTEN_DATA_CONNECTION_STATE);
 
-        mHandler.sendMessageDelayed(mHandler.obtainMessage(EVENT_FIX_UPTIME), 0);
+        mHandler.sendEmptyMessage(EVENT_UPDATE_STATS);
     }
     
     @Override
@@ -222,7 +225,7 @@ public class Status extends PreferenceActivity {
         mPhoneStateReceiver.unregisterIntent();
         mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
         unregisterReceiver(mBatteryInfoReceiver);
-        mHandler.removeMessages(EVENT_FIX_UPTIME);
+        mHandler.removeMessages(EVENT_UPDATE_STATS);
     }
 
     /**
@@ -349,6 +352,17 @@ public class Status extends PreferenceActivity {
         }
     }
 
+    private void setNetworkTrafficStats() {
+        long txPkts = NetStat.getTotalTxPkts();
+        long txBytes = NetStat.getTotalTxBytes();
+        long rxPkts = NetStat.getTotalRxPkts();
+        long rxBytes = NetStat.getTotalRxBytes();
+
+        Preference netStatsPref = findPreference(KEY_NETWORK_TRAFFIC_STATS);
+        netStatsPref.setSummary(getString(R.string.status_network_traffic_summary,
+                txPkts, txBytes, rxPkts, rxBytes));
+    }
+
     void updateTimes() {
         long at = SystemClock.uptimeMillis() / 1000;
         long ut = SystemClock.elapsedRealtime() / 1000;
diff --git a/src/com/android/settings/quicklaunch/QuickLaunchSettings.java b/src/com/android/settings/quicklaunch/QuickLaunchSettings.java
index 2ec685d..4d44524 100644
--- a/src/com/android/settings/quicklaunch/QuickLaunchSettings.java
+++ b/src/com/android/settings/quicklaunch/QuickLaunchSettings.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.quicklaunch;
 
-import com.android.settings.R;
-
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -28,10 +26,9 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
-import android.preference.PreferenceCategory;
+import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.Settings.Bookmarks;
-import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
 import android.util.SparseBooleanArray;
@@ -40,6 +37,8 @@ import android.view.KeyEvent;
 import android.view.View;
 import android.widget.AdapterView;
 
+import com.android.settings.R;
+
 /**
  * Settings activity for quick launch.
  * <p>
@@ -76,7 +75,7 @@ public class QuickLaunchSettings extends PreferenceActivity implements
     private SparseBooleanArray mBookmarkedShortcuts;
     
     /** Preference category to hold the shortcut preferences. */
-    private PreferenceCategory mShortcutCategory;
+    private PreferenceGroup mShortcutGroup;
     /** Mapping of a shortcut to its preference. */
     private SparseArray<ShortcutPreference> mShortcutToPreference;
 
@@ -93,7 +92,7 @@ public class QuickLaunchSettings extends PreferenceActivity implements
         
         addPreferencesFromResource(R.xml.quick_launch_settings);
         
-        mShortcutCategory = (PreferenceCategory) findPreference(KEY_SHORTCUT_CATEGORY);
+        mShortcutGroup = (PreferenceGroup) findPreference(KEY_SHORTCUT_CATEGORY);
         mShortcutToPreference = new SparseArray<ShortcutPreference>();
         mBookmarksObserver = new BookmarksObserver(mUiHandler);
         initShortcutPreferences();
@@ -252,7 +251,7 @@ public class QuickLaunchSettings extends PreferenceActivity implements
     
     private ShortcutPreference createPreference(char shortcut) {
         ShortcutPreference pref = new ShortcutPreference(QuickLaunchSettings.this, shortcut);
-        mShortcutCategory.addPreference(pref);
+        mShortcutGroup.addPreference(pref);
         mShortcutToPreference.put(shortcut, pref);
         return pref;
     }